diff --git a/frappe/__init__.py b/frappe/__init__.py
index e805a2b1d4..b3c85865bb 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -190,7 +190,9 @@ def cache():
 	global redis_server
 	if not redis_server:
 		from frappe.utils.redis_wrapper import RedisWrapper
-		redis_server = RedisWrapper.from_url(conf.get("cache_redis_server") or "redis://localhost:11311")
+		redis_server = RedisWrapper.from_url(conf.get('redis_cache')
+			or conf.get("cache_redis_server")
+			or "redis://localhost:11311")
 	return redis_server
 
 def get_traceback():
diff --git a/frappe/async.py b/frappe/async.py
index 7875801237..dd530d980a 100644
--- a/frappe/async.py
+++ b/frappe/async.py
@@ -171,11 +171,13 @@ def put_log(line_no, line, task_id=None):
 
 
 def get_redis_server():
-	"""Returns memcache connection."""
+	"""returns redis_socketio connection."""
 	global redis_server
 	if not redis_server:
 		from redis import Redis
-		redis_server = Redis.from_url(conf.get("async_redis_server") or "redis://localhost:12311")
+		redis_server = Redis.from_url(conf.get("redis_socketio")
+			or conf.get("async_redis_server")
+			or "redis://localhost:12311")
 	return redis_server
 
 
diff --git a/frappe/celery_app.py b/frappe/celery_app.py
index bb129cddf4..77aab76cee 100644
--- a/frappe/celery_app.py
+++ b/frappe/celery_app.py
@@ -32,8 +32,8 @@ def get_celery():
 def get_celery_app():
 	conf = get_site_config()
 	app = Celery('frappe',
-			broker=conf.celery_broker or DEFAULT_CELERY_BROKER,
-			backend=conf.async_redis_server or DEFAULT_CELERY_BACKEND)
+			broker=conf.redis_queue or conf.celery_broker or DEFAULT_CELERY_BROKER,
+			backend=conf.redis_queue or conf.async_redis_server or DEFAULT_CELERY_BACKEND)
 
 	app.autodiscover_tasks(frappe.get_all_apps(with_internal_apps=False,
 		sites_path=SITES_PATH))
diff --git a/socketio.js b/socketio.js
index 87ee33e84f..2e1853c394 100644
--- a/socketio.js
+++ b/socketio.js
@@ -7,7 +7,7 @@ var redis = require("redis");
 var request = require('superagent');
 
 var conf = get_conf();
-var subscriber = redis.createClient(conf.redis_async_broker_port);
+var subscriber = redis.createClient(conf.redis_socketio || conf.redis_async_broker_port);
 
 // serve socketio
 http.listen(conf.socketio_port, function(){
@@ -268,16 +268,21 @@ function get_conf() {
 		socketio_port: 3000
 	};
 
-	// get ports from bench/config.json
-	if(fs.existsSync('config.json')){
-		var bench_config = JSON.parse(fs.readFileSync('config.json'));
-		for (var key in conf) {
-			if (bench_config[key]) {
-				conf[key] = bench_config[key];
+	var read_config = function(path) {
+		if(fs.existsSync(path)){
+			var bench_config = JSON.parse(fs.readFileSync(path));
+			for (var key in conf) {
+				if (bench_config[key]) {
+					conf[key] = bench_config[key];
+				}
 			}
 		}
 	}
 
+	// get ports from bench/config.json
+	read_config('config.json');
+	read_config('sites/common_site_config.json');
+
 	// detect current site
 	if(fs.existsSync('sites/currentsite.txt')) {
 		conf.default_site = fs.readFileSync('sites/currentsite.txt').toString().trim();