diff --git a/recipes-ros/catkin/catkin/catkin-change_default_for_debsetuptools.patch b/recipes-ros/catkin/catkin/catkin-change_default_for_debsetuptools.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5b2f4f594f7e27a65927dc6c835bc58468ba9dc4
--- /dev/null
+++ b/recipes-ros/catkin/catkin/catkin-change_default_for_debsetuptools.patch
@@ -0,0 +1,20 @@
+diff -cr a/cmake/python.cmake b/cmake/python.cmake
+*** a/cmake/python.cmake	2012-12-22 03:30:48.000000000 +0100
+--- b/cmake/python.cmake	2013-01-11 09:25:35.790346760 +0100
+***************
+*** 6,12 ****
+  set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
+  
+  #This should be resolved automatically one day...
+! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" ON)
+  
+  if(APPLE OR MSVC)
+    set(SETUPTOOLS_DEB_LAYOUT OFF)
+--- 6,12 ----
+  set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
+  
+  #This should be resolved automatically one day...
+! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" OFF)
+  
+  if(APPLE OR MSVC)
+    set(SETUPTOOLS_DEB_LAYOUT OFF)
diff --git a/recipes-ros/catkin/catkin_0.5.58.bb b/recipes-ros/catkin/catkin_0.5.58.bb
index 36d74faf13c17746b7916953da97773723caf3a5..cc41c5f25b2b5946db75fba9298c85314e54ff8a 100644
--- a/recipes-ros/catkin/catkin_0.5.58.bb
+++ b/recipes-ros/catkin/catkin_0.5.58.bb
@@ -3,7 +3,8 @@ SECTION = "devel"
 # TODO: License of catkin unmentioned in the repository
 LICENSE = "CLOSED"
 
-SRC_URI = "https://github.com/ros/catkin/archive/0.5.58.tar.gz"
+SRC_URI = "https://github.com/ros/catkin/archive/0.5.58.tar.gz \
+  file://catkin-change_default_for_debsetuptools.patch"
 SRC_URI[md5sum] = "e4df85e60dc792af9324334547cc76aa"
 SRC_URI[sha256sum] = "dd99cc04eeaf16a13185dd0a2f576939fa997dfb16a40ba45068c4d2ebbcb44b"