diff --git a/core/mk/CMakeLists.txt b/core/mk/CMakeLists.txt
index e6f67710..bec4ec09 100644
--- a/core/mk/CMakeLists.txt
+++ b/core/mk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(mk)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/core/rosbuild/CMakeLists.txt b/core/rosbuild/CMakeLists.txt
index 7fd14109..d45ebebb 100644
--- a/core/rosbuild/CMakeLists.txt
+++ b/core/rosbuild/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosbuild)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/core/rosbuild/private.cmake b/core/rosbuild/private.cmake
index 4eacebd1..dccf9815 100644
--- a/core/rosbuild/private.cmake
+++ b/core/rosbuild/private.cmake
@@ -114,13 +114,13 @@ endmacro(_rosbuild_check_rostest_xml_result test_name)
 
 macro(_rosbuild_add_gtest exe)
   # Look for optional TIMEOUT argument, #2645
-  parse_arguments(_gtest "TIMEOUT" "" ${ARGN})
+  cmake_parse_arguments(_gtest "" "TIMEOUT" "" ${ARGN})
   if(NOT _gtest_TIMEOUT)
     set(_gtest_TIMEOUT 60.0)
   endif(NOT _gtest_TIMEOUT)
 
   # Create the program, with basic + gtest build flags
-  rosbuild_add_executable(${exe} EXCLUDE_FROM_ALL ${_gtest_DEFAULT_ARGS})
+  rosbuild_add_executable(${exe} EXCLUDE_FROM_ALL ${_gtest_UNPARSED_ARGUMENTS})
   rosbuild_add_gtest_build_flags(${exe})
 
   # Create a legal target name, in case the target name has slashes in it
@@ -212,7 +212,7 @@ endmacro(_rosbuild_add_rostest)
 
 macro(_rosbuild_add_pyunit file)
   # Look for optional TIMEOUT argument, #2645
-  parse_arguments(_pyunit "TIMEOUT" "" ${ARGN})
+  cmake_parse_arguments(_pyunit "" "TIMEOUT" "" ${ARGN})
   if(NOT _pyunit_TIMEOUT)
     set(_pyunit_TIMEOUT 60.0)
   endif(NOT _pyunit_TIMEOUT)
diff --git a/core/roslang/CMakeLists.txt b/core/roslang/CMakeLists.txt
index d5ad4d44..8baa5a46 100644
--- a/core/roslang/CMakeLists.txt
+++ b/core/roslang/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(roslang)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/core/roslib/CMakeLists.txt b/core/roslib/CMakeLists.txt
index f4549cb3..e4b6b46b 100644
--- a/core/roslib/CMakeLists.txt
+++ b/core/roslib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(roslib)
 find_package(catkin REQUIRED COMPONENTS rospack)
 catkin_package(
@@ -48,3 +48,7 @@ catkin_add_gtest(${PROJECT_NAME}-test_package test/package.cpp)
 if(TARGET ${PROJECT_NAME}-test_package)
   target_link_libraries(${PROJECT_NAME}-test_package roslib ${catkin_LIBRARIES})
 endif()
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.cmake "")
+export(TARGETS roslib FILE ${CMAKE_CURRENT_BINARY_DIR}/export.cmake APPEND)
+#include(${CMAKE_CURRENT_BINARY_DIR}/export.cmake)
diff --git a/ros/CMakeLists.txt b/ros/CMakeLists.txt
index ecec0d56..ce13f684 100644
--- a/ros/CMakeLists.txt
+++ b/ros/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(ros)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tools/rosbash/CMakeLists.txt b/tools/rosbash/CMakeLists.txt
index 44e81bcf..90ad3a89 100644
--- a/tools/rosbash/CMakeLists.txt
+++ b/tools/rosbash/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosbash)
 find_package(catkin)
 catkin_package()
diff --git a/tools/rosboost_cfg/CMakeLists.txt b/tools/rosboost_cfg/CMakeLists.txt
index 651e8b77..51ce1112 100644
--- a/tools/rosboost_cfg/CMakeLists.txt
+++ b/tools/rosboost_cfg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosboost_cfg)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tools/rosclean/CMakeLists.txt b/tools/rosclean/CMakeLists.txt
index eeba0a34..2fd890d9 100644
--- a/tools/rosclean/CMakeLists.txt
+++ b/tools/rosclean/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosclean)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tools/roscreate/CMakeLists.txt b/tools/roscreate/CMakeLists.txt
index db58e050..10834581 100644
--- a/tools/roscreate/CMakeLists.txt
+++ b/tools/roscreate/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(roscreate)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tools/rosmake/CMakeLists.txt b/tools/rosmake/CMakeLists.txt
index 7be93edf..df52e276 100644
--- a/tools/rosmake/CMakeLists.txt
+++ b/tools/rosmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosmake)
 find_package(catkin REQUIRED)
 
diff --git a/tools/rosunit/CMakeLists.txt b/tools/rosunit/CMakeLists.txt
index 17f521bb..ebfd3814 100644
--- a/tools/rosunit/CMakeLists.txt
+++ b/tools/rosunit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.3)
 project(rosunit)
 find_package(catkin REQUIRED)
 catkin_package(CFG_EXTRAS ${PROJECT_NAME}-extras.cmake)
diff --git a/tools/rosunit/cmake/rosunit-extras.cmake.in b/tools/rosunit/cmake/rosunit-extras.cmake.in
index 9a1f6dfb..8e07c10f 100644
--- a/tools/rosunit/cmake/rosunit-extras.cmake.in
+++ b/tools/rosunit/cmake/rosunit-extras.cmake.in
@@ -1,3 +1,5 @@
+include(CMakeParseArguments)
+
 macro(rosunit_initialize_tests)
   if (@BUILDSPACE@)
     find_program_required(ROSUNIT_EXE rosunit
@@ -17,7 +19,7 @@ function(add_pyunit file)
   message(WARNING "add_pyunit() is deprecated.  For Python tests, use add_nostests() instead.")
 
   # Look for optional TIMEOUT argument, #2645
-  parse_arguments(_pyunit "TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})
+  cmake_parse_arguments(_pyunit "" "TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})
   if(NOT _pyunit_TIMEOUT)
     set(_pyunit_TIMEOUT 60.0)
   endif()