diff --git a/config/elasticsearch.yml b/config/elasticsearch.yml
index 1c6675893c2..1baec237fa3 100644
--- a/config/elasticsearch.yml
+++ b/config/elasticsearch.yml
@@ -5,7 +5,7 @@
 # consult the guide at <http://elasticsearch.org/guide>.
 #
 # The installation procedure is covered at
-# <http://elasticsearch.org/guide/reference/setup/installation.html>.
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
 #
 # ElasticSearch comes with reasonable defaults for most settings,
 # so you can try it out without bothering with configuration.
@@ -20,8 +20,8 @@
 #
 # node.rack: ${RACK_ENV_VAR}
 
-# See <http://elasticsearch.org/guide/reference/setup/configuration.html>
-# for information on supported formats and syntax for the configuration file.
+# For information on supported formats and syntax for the config file, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
 
 
 ################################### Cluster ###################################
@@ -96,8 +96,8 @@
 # Note, that it makes more sense to configure index settings specifically for
 # a certain index, either when creating it or by using the index templates API.
 #
-# See <http://elasticsearch.org/guide/reference/index-modules/> and
-# <http://elasticsearch.org/guide/reference/api/admin-indices-create-index.html>
+# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
 # for more information.
 
 # Set the number of shards (splits) of an index (5 by default):
@@ -237,8 +237,8 @@
 # in the gateway, and when the cluster starts up for the first time,
 # it will read its state from the gateway.
 
-# There are several types of gateway implementations. For more information,
-# see <http://elasticsearch.org/guide/reference/modules/gateway>.
+# There are several types of gateway implementations. For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
 
 # The default gateway type is the "local" gateway (recommended):
 #
@@ -307,8 +307,8 @@
 #
 # discovery.zen.ping.timeout: 3s
 
-# See <http://elasticsearch.org/guide/reference/modules/discovery/zen.html>
-# for more information.
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
 
 # Unicast discovery allows to explicitly control which nodes will be used
 # to discover the cluster. It can be used when multicast is not present,
@@ -327,10 +327,10 @@
 #
 # You have to install the cloud-aws plugin for enabling the EC2 discovery.
 #
-# See <http://elasticsearch.org/guide/reference/modules/discovery/ec2.html>
-# for more information.
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
 #
-# See <http://elasticsearch.org/tutorials/2011/08/22/elasticsearch-on-ec2.html>
+# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
 # for a step-by-step tutorial.