diff --git a/script/server b/script/server
index 5e1c072b2..633786c46 100755
--- a/script/server
+++ b/script/server
@@ -35,11 +35,11 @@ fi
 
 # Setup environment
 OS=`uname -s`
-export RAILS_ENV=$(./script/get_config.rb rails_env script_server)
-export DB=$(./script/get_config.rb db script_server)
-THIN_PORT=$(./script/get_config.rb thin_port script_server)
-eval "DEFAULT_THIN_ARGS=\"$(./script/get_config.rb default_thin_args script_server)\""
-SOCKET_PORT=$(./script/get_config.rb socket_port $RAILS_ENV)
+export RAILS_ENV=$(bundle exec ruby ./script/get_config.rb rails_env script_server)
+export DB=$(bundle exec ruby ./script/get_config.rb db script_server)
+THIN_PORT=$(bundle exec ruby ./script/get_config.rb thin_port script_server)
+eval "DEFAULT_THIN_ARGS=\"$(bundle exec ruby ./script/get_config.rb default_thin_args script_server)\""
+SOCKET_PORT=$(bundle exec ruby ./script/get_config.rb socket_port $RAILS_ENV)
 
 # Backward compatibillity, overide default settings
 [ -e config/server.sh ] && source config/server.sh
@@ -153,7 +153,7 @@ fi
 
 # Start Diaspora
 
-if [ "$(./script/get_config.rb 'single_process_mode?')" != "true" ]; then
+if [ "$(bundle exec ruby ./script/get_config.rb 'single_process_mode?')" != "true" ]; then
     redis_config
     redis-server config/redis.conf &>log/redis-console.log &