diff --git a/config.js b/config.js
index 419dbc152c7..f78faac98b6 100644
--- a/config.js
+++ b/config.js
@@ -12,10 +12,14 @@ If you need to configure the default dashboard, please see dashboards/default
 */
 var config = new Settings(
 {
-  elasticsearch:  'http://localhost:9200',
-  kibana_index:   "kibana-int", 
-  modules:        ['histogram','map','pie','table','stringquery','sort',
-                  'timepicker','text','fields','hits','dashcontrol',
-                  'column'],
+  // By default this will attempt to reach ES at the same host you have
+  // elasticsearch installed on. You probable want to set it to the FQDN of your
+  // elasticsearch host
+  elasticsearch:    "http://"+window.location.hostname+":9200",   
+  // elasticsearch: 'http://localhost:9200',
+  kibana_index:     "kibana-int", 
+  modules:          ['histogram','map','pie','table','stringquery','sort',
+                    'timepicker','text','fields','hits','dashcontrol',
+                    'column'],
   }
 );