diff --git a/README.md b/README.md
index cda766b4d1..810597a88f 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,32 @@
 CraftBukkit
-===========
+======
+An implemenation of the [Bukkit](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit) plugin API for [Minecraft](https://minecraft.net/) servers, currently maintained by [SpigotMC](http://www.spigotmc.org/).
 
-A Bukkit (Minecraft Server API) 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)
+Bug Reporting
+-------------
+The development team is very open to both bug and feature requests / suggestions. You can submit these on the [JIRA Issue Tracker](http://hub.spigotmc.org/jira/).
 
 Compilation
 -----------
+CraftBukkit is a Java program which uses [Maven 3](http://maven.apache.org/) for compilation. To compile fresh from Git, simply perform the following steps:
 
-We use maven to handle our dependencies.
+* Install Git using your preferred installation methods.
+* Download and run [BuildTools](https://www.spigotmc.org/wiki/buildtools/)
+ 
+Some IDEs such as [NetBeans](https://netbeans.org/) can perform these steps for you. Any Maven capable Java IDE can be used to develop with CraftBukkit, however the current team's personal preference is to use NetBeans.
 
-* 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 this repo and: `mvn clean package`
+Contributing
+------------
+Contributions of all sorts are welcome. To manage community contributions, we use the pull request functionality of Stash. In to gain access to Stash and create a pull request, you will first need to perform the following steps:
+
+* Create an account on [JIRA](http://hub.spigotmc.org/jira/).
+* Fill in the [SpigotMC CLA](http://www.spigotmc.org/go/cla) and wait up to 24 hours for your Stash account to be activated. Please ensure that your username and email addresses match.
+* Log into Stash using your JIRA credentials.
+ 
+Once you have performed these steps you can create a fork, push your code changes, and then submit it for review.
+
+If you submit a PR involving both Bukkit and CraftBukkit, it's appreciated if each PR links the other. Additionally, every reference to an obfuscated field/method in NMS should be marked with `// PAIL: Rename` and optionally a suggested name, to make mapping creation easier. E.g.:
+```
+    entity.k.get(i).f(); // PAIL Rename pathfinders, navigateToHome 
+```
+Also, make sure to include `// Craftbukkit` comments to indicate modified NMS sources.