diff --git a/README.md b/README.md
index a26941d..2716f97 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Currently, this layer is still under continuous development.
   * Source Code Repository: https://github.com/bmwcarit/meta-ros.git
   * Issue Tracker: https://github.com/bmwcarit/meta-ros/issues
   * Mailing List: https://groups.google.com/forum/#!forum/meta-ros
-  * Installation Guide: http://wiki.ros.org/hydro/Installation/OpenEmbedded
+  * Installation Guide: http://wiki.ros.org/indigo/Installation/OpenEmbedded
   * Development Guides:
     * https://github.com/bmwcarit/meta-ros/wiki/Guidelines-for-ROS-recipes
     * https://github.com/bmwcarit/meta-ros/wiki/Developer-Guidelines
@@ -153,13 +153,13 @@ Currently, this layer is still under continuous development.
 
   to the /etc/hosts file, and set up the environment with
 
-    export ROS_ROOT=/opt/ros/hydro
-    export PATH=$PATH:/opt/ros/hydro/bin
-    export LD_LIBRARY_PATH=/opt/ros/hydro/lib
-    export PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages
+    export ROS_ROOT=/opt/ros/indigo
+    export PATH=$PATH:/opt/ros/indigo/bin
+    export LD_LIBRARY_PATH=/opt/ros/indigo/lib
+    export PYTHONPATH=/opt/ros/indigo/lib/python2.7/site-packages
     export ROS_MASTER_URI=http://localhost:11311
-    export CMAKE_PREFIX_PATH=/opt/ros/hydro
-    touch /opt/ros/hydro/.catkin
+    export CMAKE_PREFIX_PATH=/opt/ros/indigo
+    touch /opt/ros/indigo/.catkin
 
   Finally, you can start roscore with
 
diff --git a/conf/layer.conf b/conf/layer.conf
index 6bcc666..9c9276f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PRIORITY_ros-layer = "7"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-ROSDISTRO := "hydro"
+ROSDISTRO := "indigo"
diff --git a/recipes-ros/ros-comm/roslaunch/roscore-default b/recipes-ros/ros-comm/roslaunch/roscore-default
index 094ad52..d88713d 100644
--- a/recipes-ros/ros-comm/roslaunch/roscore-default
+++ b/recipes-ros/ros-comm/roslaunch/roscore-default
@@ -1,7 +1,7 @@
-ROS_ROOT=/opt/ros/hydro/
+ROS_ROOT=/opt/ros/indigo/
 ROS_PORT=11311
 ROS_MASTER_URI=http://localhost:11311
-CMAKE_PREFIX_PATH=/opt/ros/hydro/
-PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/hydro/bin
-LD_LIBRARY_PATH=/opt/ros/hydro/lib
-PYTHONPATH=/opt/ros/hydro/lib/python2.7/site-packages
+CMAKE_PREFIX_PATH=/opt/ros/indigo/
+PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/ros/indigo/bin
+LD_LIBRARY_PATH=/opt/ros/indigo/lib
+PYTHONPATH=/opt/ros/indigo/lib/python2.7/site-packages
diff --git a/recipes-ros/ros-comm/roslaunch/roscore.service b/recipes-ros/ros-comm/roslaunch/roscore.service
index fd628d0..d7db641 100644
--- a/recipes-ros/ros-comm/roslaunch/roscore.service
+++ b/recipes-ros/ros-comm/roslaunch/roscore.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 EnvironmentFile=/etc/default/roscore
 ExecStartPre=/bin/touch ${CMAKE_PREFIX_PATH}/.catkin
-ExecStart=/opt/ros/hydro/bin/roscore -p $ROS_PORT
+ExecStart=/opt/ros/indigo/bin/roscore -p $ROS_PORT
 Restart=on-abort
 
 [Install]