diff --git a/install-groovy.sh b/install-groovy.sh
index 5522193..a37004c 100644
--- a/install-groovy.sh
+++ b/install-groovy.sh
@@ -14,28 +14,7 @@ SRC_DIRECTORY="/home/lukas/ros_catkin_ws"
 scp $USERNAME@$HOST_IP:$SRC_DIRECTORY/src.tar.gz .
 mkdir ros_catkin_ws
 cd ros_catkin_ws
+# extract
 tar -xzf ../src.tar.gz
-# patch catkin
-patch -p1 << EOF
-*** A/src/catkin/cmake/python.cmake	2013-01-04 14:22:33.223884756 +0100
---- B/src/catkin/cmake/python.cmake	2013-01-04 14:28:01.971898385 +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)
-EOF
-# run catkin
-./src/catkin/bin/catkin_make_isolated --install
+# compile, make and install
+catkin_make_isolated --install
diff --git a/recipes-core/images/core-image-ros-groovy.bb b/recipes-core/images/core-image-ros-groovy.bb
index 6a10b0a..517c7ad 100644
--- a/recipes-core/images/core-image-ros-groovy.bb
+++ b/recipes-core/images/core-image-ros-groovy.bb
@@ -28,4 +28,6 @@ IMAGE_INSTALL += "packagegroup-core-ssh-openssh cmake \
   python-modules python-misc python-empy python-setuptools \
   boost boost-dev python-dev libtinyxml libtinyxml-dev \
   log4cxx log4cxx-dev libbz2-dev \
-  python-argparse python-rosdep python-wstool"
+  python-argparse python-rosdep python-wstool \
+  catkin \
+  "