diff --git a/Bukkit-Patches/0022-Add-Spigot-Links.patch b/Bukkit-Patches/0022-Add-Spigot-Links.patch
new file mode 100644
index 0000000000..72142659a6
--- /dev/null
+++ b/Bukkit-Patches/0022-Add-Spigot-Links.patch
@@ -0,0 +1,29 @@
+From 14c006ae726e917824a6bd4e394582f4834a2d28 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Thu, 23 Jan 2014 13:17:38 +1100
+Subject: [PATCH] Add Spigot Links
+
+
+diff --git a/README.md b/README.md
+index a51766e..1905b8d 100644
+--- a/README.md
++++ b/README.md
+@@ -1,11 +1,11 @@
+-Bukkit
++Spigot-API
+ ======
+ 
+ A Minecraft Server API.
+ 
+-Website: [http://bukkit.org](http://bukkit.org)  
+-Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org)  
+-Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/Bukkit/blob/master/CONTRIBUTING.md)
++Website: [http://spigotmc.org](http://spigotmc.org)  
++Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/)  
++Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md)
+ 
+ Compilation
+ -----------
+-- 
+1.8.3.2
+
diff --git a/CraftBukkit-Patches/0101-Add-Spigot-Links.patch b/CraftBukkit-Patches/0101-Add-Spigot-Links.patch
new file mode 100644
index 0000000000..2dbdaebe34
--- /dev/null
+++ b/CraftBukkit-Patches/0101-Add-Spigot-Links.patch
@@ -0,0 +1,59 @@
+From 0aa241c591167cc1d647aad6ee34b669f48e3991 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Thu, 23 Jan 2014 13:17:35 +1100
+Subject: [PATCH] Add Spigot Links
+
+
+diff --git a/README.md b/README.md
+index cda766b..1f12a75 100644
+--- a/README.md
++++ b/README.md
+@@ -1,11 +1,11 @@
+-CraftBukkit
++Spigot
+ ===========
+ 
+-A Bukkit (Minecraft Server API) implementation
++A Spigot-API and Bukkit implementation
+ 
+-Website: [http://bukkit.org](http://bukkit.org)  
+-Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org)  
+-Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/CraftBukkit/blob/master/CONTRIBUTING.md)
++Website: [http://spigotmc.org](http://spigotmc.org)  
++Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/)  
++Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md)
+ 
+ Compilation
+ -----------
+@@ -13,6 +13,6 @@ Compilation
+ We use maven to handle our dependencies.
+ 
+ * Install [Maven 3](http://maven.apache.org/download.html)
+-* Check out and install [Bukkit](http://github.com/Bukkit/Bukkit)
+-    * *Note*: this is not needed as the repository we use has Bukkit too, but you might have a newer one (with your own changes :D)
++* Check out and install [Spigot-API](http://github.com/SpigotMC/Spigot)
++    * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D)
+ * Check out this repo and: `mvn clean package`
+diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
+index 60a894f..072c925 100644
+--- a/src/main/resources/configurations/bukkit.yml
++++ b/src/main/resources/configurations/bukkit.yml
+@@ -6,11 +6,10 @@
+ # If you need help on this file, feel free to join us on irc or leave a message
+ # on the forums asking for advice.
+ #
+-# IRC: #bukkit @ esper.net
+-#    (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit )
+-# Forums: http://forums.bukkit.org/forums/bukkit-help.6/
+-# Twitter: http://twitter.com/Craftbukkit
+-# Bug tracker: http://leaky.bukkit.org/
++# IRC: #spigot @ irc.spi.gt
++#    (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot )
++# Forums: http://www.spigotmc.org/forums/help.40/
++# Bug tracker: http://www.spigotmc.org/forums/bugs-feature-requests.8/
+ 
+ 
+ settings:
+-- 
+1.8.3.2
+