diff --git a/recipes-devtools/python/python-catkin-pkg_0.3.9.bb b/recipes-devtools/python/python-catkin-pkg_0.3.9.bb
index 4fe5422704a..07277ce9557 100644
--- a/recipes-devtools/python/python-catkin-pkg_0.3.9.bb
+++ b/recipes-devtools/python/python-catkin-pkg_0.3.9.bb
@@ -1,5 +1,7 @@
 require python-catkin-pkg.inc
 
+PREFERRED_VERSION_python = "2.7.%"
+
 SRC_URI[md5sum] = "39405b11aba691b7a9660a1ceaf25f84"
 SRC_URI[sha256sum] = "ecc4fd6b6c7cebc0d9a38fc38dc0e270cc4e684a6c874a006b2834a98bf5590c"
 
diff --git a/recipes-ros-lunar/catkin/catkin.inc b/recipes-ros-lunar/catkin/catkin.inc
index 5d9d2d64777..6a94877a0ff 100644
--- a/recipes-ros-lunar/catkin/catkin.inc
+++ b/recipes-ros-lunar/catkin/catkin.inc
@@ -1,18 +1,6 @@
-DEPENDS = "cmake ${PYTHON_PN}-empy-native ${PYTHON_PN}-catkin-pkg-native"
-
 SRC_URI += "\
     file://0001-Duplicate-changes-for-newer-catkin-releases.patch \
-    file://0001-avoid-using-host-s-paths-when-cross-compiling.patch"
+    file://0001-avoid-using-host-s-paths-when-cross-compiling.patch \
+    file://0001-Force-python-2.patch"
 
 inherit catkin
-
-# FILES_${PN} += "\
-#     ${ros_datadir}/eigen/cmake \
-#     ${ros_datadir}/ros/cmake \
-#     ${ros_datadir}/.catkin \
-#     ${ros_prefix}/.catkin \
-#     ${ros_prefix}/.rosinstall \
-#     ${ros_prefix}/_setup_util.py \
-#     ${ros_prefix}/env.sh \
-#     ${ros_prefix}/setup.* \
-#     "
diff --git a/recipes-ros-lunar/catkin/catkin_0.7.8.bb b/recipes-ros-lunar/catkin/catkin_0.7.8.bb
index 86ca77926ce..097e83a5ab2 100644
--- a/recipes-ros-lunar/catkin/catkin_0.7.8.bb
+++ b/recipes-ros-lunar/catkin/catkin_0.7.8.bb
@@ -5,6 +5,7 @@ DESCRIPTION = "Low-level build system macros and infrastructure for ROS."
 AUTHOR = "OSRF"
 SECTION = "devel"
 ROSDISTRO = "lunar"
+CATKIN_NO_BIN="True"
 
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
@@ -16,5 +17,13 @@ SRC_URI[md5sum] = "1fef00c3336dfa23e2ec6d5f54741d95"
 SRC_URI[sha256sum] = "2057edf73b042a304447c7433e97056f07a32e74a98a01b40ecd06064f1603b9"
 S = "${WORKDIR}/${PN}-release-release-lunar-${PN}-0.7.8-0"
 
-inherit catkin
 include catkin.inc
+
+
+FILES_${PN} += "/opt/ros/lunar/.catkin \
+          /opt/ros/lunar/_setup_util.py \
+          /opt/ros/lunar/env.sh \
+          /opt/ros/lunar/setup.bash \
+          /opt/ros/lunar/setup.sh \
+          /opt/ros/lunar/setup.zsh \
+          /opt/ros/lunar/.rosinstall"
diff --git a/recipes-ros-lunar/catkin/files/0001-Force-python-2.patch b/recipes-ros-lunar/catkin/files/0001-Force-python-2.patch
new file mode 100644
index 00000000000..68b656bab93
--- /dev/null
+++ b/recipes-ros-lunar/catkin/files/0001-Force-python-2.patch
@@ -0,0 +1,22 @@
+From 6e50366f6353aef8efc3480772051401b346d088 Mon Sep 17 00:00:00 2001
+From: "Hunter L. Allen" <hunter@openrobotics.org>
+Date: Mon, 18 Dec 2017 14:55:50 -0500
+Subject: [PATCH] Force python 2.
+
+---
+ cmake/templates/_setup_util.py.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in
+index 106507a..bd85ac1 100755
+--- a/cmake/templates/_setup_util.py.in
++++ b/cmake/templates/_setup_util.py.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON_EXECUTABLE@
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ # Software License Agreement (BSD License)
+-- 
+2.7.4
+
diff --git a/recipes-ros-lunar/rosgraph-msgs/rosgraph-msgs_1.11.2.bb b/recipes-ros-lunar/rosgraph-msgs/rosgraph-msgs_1.11.2.bb
index 9fd6ae437cf..cb45412cbd8 100644
--- a/recipes-ros-lunar/rosgraph-msgs/rosgraph-msgs_1.11.2.bb
+++ b/recipes-ros-lunar/rosgraph-msgs/rosgraph-msgs_1.11.2.bb
@@ -8,7 +8,7 @@ ROSDISTRO = "lunar"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "catkin catkin-native message-generation message-runtime std-msgs"
+DEPENDS = "catkin catkin-native message-generation message-runtime std-msgs python-catkin-pkg"
 SRC_URI = "https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/lunar/rosgraph_msgs/1.11.2-0.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 
 SRC_URI[md5sum] = "49ede31404d4666a0f52dacb78e408dd"