diff --git a/core/roslib/setup.py b/core/roslib/setup.py
index 7b7f9d72..7e01ad9f 100644
--- a/core/roslib/setup.py
+++ b/core/roslib/setup.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['ros', 'roslib']
-d['package_dir'] = {'': 'src'}
-d['requires'] = ['rospkg']
+d = generate_distutils_setup(
+    packages=['ros', 'roslib'],
+    package_dir={'': 'src'},
+    requires=['rospkg']
+)
 
 setup(**d)
diff --git a/tools/rosboost_cfg/setup.py b/tools/rosboost_cfg/setup.py
index 0749f63a..b71b5d10 100644
--- a/tools/rosboost_cfg/setup.py
+++ b/tools/rosboost_cfg/setup.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['rosboost_cfg']
-d['package_dir'] = {'': 'src'}
-d['scripts'] = ['scripts/rosboost-cfg']
+d = generate_distutils_setup(
+    packages=['rosboost_cfg'],
+    package_dir={'': 'src'},
+    scripts=['scripts/rosboost-cfg']
+)
 
 setup(**d)
diff --git a/tools/rosclean/setup.py b/tools/rosclean/setup.py
index 1e2841cc..d80920ba 100644
--- a/tools/rosclean/setup.py
+++ b/tools/rosclean/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['rosclean']
-d['package_dir'] = {'': 'src'}
-d['scripts'] = ['scripts/rosclean']
-d['requires'] = ['rospkg']
+d = generate_distutils_setup(
+    packages=['rosclean'],
+    package_dir={'': 'src'},
+    scripts=['scripts/rosclean'],
+    requires=['rospkg']
+)
 
 setup(**d)
diff --git a/tools/roscreate/setup.py b/tools/roscreate/setup.py
index dba58989..95f1b3b4 100644
--- a/tools/roscreate/setup.py
+++ b/tools/roscreate/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['roscreate']
-d['package_dir'] = {'': 'src'}
-d['scripts'] = ['scripts/roscreate-pkg']
-d['requires'] = ['roslib', 'rospkg']
+d = generate_distutils_setup(
+    packages=['roscreate'],
+    package_dir={'': 'src'},
+    scripts=['scripts/roscreate-pkg'],
+    requires=['roslib', 'rospkg']
+)
 
 setup(**d)
diff --git a/tools/rosmake/setup.py b/tools/rosmake/setup.py
index e8fb3fed..421b504c 100644
--- a/tools/rosmake/setup.py
+++ b/tools/rosmake/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['rosmake']
-d['package_dir'] = {'': 'src'}
-d['scripts'] = ['scripts/rosmake']
-d['requires'] = ['rospkg']
+d = generate_distutils_setup(
+    packages=['rosmake'],
+    package_dir={'': 'src'},
+    scripts=['scripts/rosmake'],
+    requires=['rospkg']
+)
 
 setup(**d)
diff --git a/tools/rosunit/setup.py b/tools/rosunit/setup.py
index c529c008..db8db6da 100644
--- a/tools/rosunit/setup.py
+++ b/tools/rosunit/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
-d['packages'] = ['rosunit']
-d['package_dir'] = {'': 'src'}
-d['scripts'] = ['scripts/rosunit']
-d['requires'] = ['rospkg']
+d = generate_distutils_setup(
+    packages=['rosunit'],
+    package_dir={'': 'src'},
+    scripts=['scripts/rosunit'],
+    requires=['rospkg']
+)
 
 setup(**d)