diff --git a/.foreman b/.foreman
index a39123f3a..d85990e35 100644
--- a/.foreman
+++ b/.foreman
@@ -1,2 +1,2 @@
 port: 3000
-formation: web=1,sidekiq=0
+formation: xmpp=0,web=1,sidekiq=0
diff --git a/Procfile b/Procfile
index 109ee2337..ba5e1bdc0 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,3 @@
 web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
 sidekiq: bundle exec sidekiq
+xmpp: bundle exec vines start
diff --git a/script/server b/script/server
index faf43111e..cc8d59d38 100755
--- a/script/server
+++ b/script/server
@@ -137,6 +137,7 @@ https://github.com/diaspora/diaspora/issues/4202 for details
 "
 fi
 
+vines=0
 # Start Diaspora
 echo -n "Starting Diaspora in $RAILS_ENV mode on port $port "
 if [ "$embed_sidekiq_worker" = "true" ]
@@ -152,4 +153,4 @@ else
 fi
 echo ""
 
-exec bundle exec foreman start -m "web=1,sidekiq=$workers" -p $port
+exec bundle exec foreman start -m "xmpp=$vines,web=1,sidekiq=$workers" -p $port