diff --git a/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch b/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch
index 3c76482..8eef126 100644
--- a/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch
+++ b/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch
@@ -1,29 +1,33 @@
-From 93cb4ebe5c4063d3ed5c0baf0b696476a90306cb Mon Sep 17 00:00:00 2001
-From: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
-Date: Tue, 4 Jun 2013 17:53:08 +0200
+From 4e51c828b27eb1d67a3199c692aac1783f853493 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Fri, 12 Jul 2013 09:59:13 +0200
 Subject: [PATCH] gencpp-extras.cmake.em: Use find_program for GENCPP_BIN
 
-Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
+This patch was originally created by
+Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>.
+I only adjusted it to the current version.
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
 ---
  cmake/gencpp-extras.cmake.em |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em
-index a77a5f1..1d4bf10 100644
+index 87f46fd..4fc5284 100644
 --- a/cmake/gencpp-extras.cmake.em
 +++ b/cmake/gencpp-extras.cmake.em
 @@ -1,13 +1,17 @@
  @[if DEVELSPACE]@
  # bin and template dir variables in develspace
--set(GENCPP_BIN @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py)
-+set(GENCPP_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts)
- set(GENCPP_TEMPLATE_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts)
+-set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py")
++set(GENCPP_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+ set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
 +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH)
  @[else]@
  # bin and template dir variables in installspace
--set(GENCPP_BIN @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py)
--set(GENCPP_TEMPLATE_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION))
-+set(GENCPP_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION))
+-set(GENCPP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
+-set(GENCPP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
++set(GENCPP_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)")
 +set(GENCPP_TEMPLATE_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
 +set(CATKIN_FIND_ROOT_PATH_MODE "")
  @[end if]@
@@ -34,5 +38,5 @@ index a77a5f1..1d4bf10 100644
  # The generated .h files should be added ALL_GEN_OUTPUT_FILES_cpp
  macro(_generate_msg_cpp ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
 -- 
-1.7.0.4
+1.7.9.5
 
diff --git a/recipes-ros/gencpp/gencpp_0.4.11.bb b/recipes-ros/gencpp/gencpp_0.4.13.bb
similarity index 74%
rename from recipes-ros/gencpp/gencpp_0.4.11.bb
rename to recipes-ros/gencpp/gencpp_0.4.13.bb
index b9a728f..7b74c68 100644
--- a/recipes-ros/gencpp/gencpp_0.4.11.bb
+++ b/recipes-ros/gencpp/gencpp_0.4.13.bb
@@ -9,7 +9,7 @@ PR = "r1"
 
 SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \
            file://0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch"
-SRC_URI[md5sum] = "be0b3986e98f3370fef4c1fffe3a69f4"
-SRC_URI[sha256sum] = "c68b4518dbc5d65fd19d43724e5c9b0e66c769ef6066e3d511a6ffce2623f3c7"
+SRC_URI[md5sum] = "801b40dcfab468f761dbdae33f848782"
+SRC_URI[sha256sum] = "d1dcd6655c8c4d4325ab067c25284032d40e00aa3409a5a5cf069d310a60d485"
 
 inherit catkin