diff --git a/Using-your-own-server.md b/Using-your-own-server.md
index 82e2dcc..b880e7f 100644
--- a/Using-your-own-server.md
+++ b/Using-your-own-server.md
@@ -8,13 +8,19 @@ To setup your own server a few things are required on your machine:
 2. Redis
 3. Memcached
 4. PostgreSQL (or possibly any other SQL Server)
+5. Maven
 
 Furthermore Accounts with Gcm, Amazon S3 and Twilio are required, but can be made optional with few changes in the code.
 
 You will also need the push server at https://github.com/WhisperSystems/PushServer
 
+Maven also needs the Capsule Plugin to generate the .jar of the PushServer. https://github.com/chrischristo/capsule-maven-plugin. Follow the instruction in their repo.  
+
 In case you're not going to use APN and/or GCM, refer to `src/main/java/org/whispersystems/pushserver/PushServer.java`
 and comment out the `lifecycle().manage()` lines.
+The lines should look like:  
+`environment.lifecycle().manage(apnSender);`    
+`environment.lifecycle().manage(gcmSender);`  
 
 Build it with `mvn package`.
 
@@ -22,7 +28,7 @@ At the time of writing this, there is no configuration sample in the repository.
 https://github.com/janimo/textsecure-docker/blob/master/config/pushconfig.yml.sample should be
 available for you to use.
 
-Run it with `java -jar target/Push-Server-VERSION-capsule-fat.jar server pushconfig.yml.sample`
+Run it with `java -jar target/Push-Server-VERSION.jar server pushconfig.yml.sample`
 
 Once the requirements are installed, continue with the following:
 
@@ -30,6 +36,7 @@ Once the requirements are installed, continue with the following:
 2. cd into the TextSecure-Server directory
 3. cp config/sample.yml local.yml
 4. edit the local.yml with your details, be sure to include the push server settings
+3. install test suite surefire https://github.com/apache/maven-surefire.git
 5. compile server with `mvn package`
 6. initialize account database with `java -jar PATH-TO-JAR accountdb migrate local.yml`
 7. initialize message store with `java -jar PATH-TO-JAR messagedb migrate local.yml`