diff --git a/scripts/rosdep b/scripts/rosdep
deleted file mode 100755
index a9284a830..000000000
--- a/scripts/rosdep
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env python
-
-from rosdep2.main import rosdep_main
-rosdep_main()
diff --git a/setup.py b/setup.py
index a718f3361..ade50bef6 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,16 @@
     'install_requires': ['catkin_pkg >= 0.4.0', 'rospkg >= 1.1.10', 'rosdistro >= 0.7.5', 'PyYAML >= 3.1'],
     'test_suite': 'nose.collector',
     'test_requires': ['mock', 'nose >= 1.0'],
-    'scripts': ['scripts/rosdep', 'scripts/rosdep-source'],
     'author': 'Tully Foote, Ken Conley',
     'author_email': 'tfoote@osrfoundation.org',
     'url': 'http://wiki.ros.org/rosdep',
     'keywords': ['ROS'],
+    'entry_points': {
+        'console_scripts': [
+            'rosdep = rosdep2.main:rosdep_main',
+            'rosdep-source = rosdep2.install:install_main'
+        ]
+    },
     'classifiers': [
         'Programming Language :: Python',
         'License :: OSI Approved :: BSD License'],
@@ -30,6 +35,6 @@
     kwargs['package_dir'] = {}
 if 'SKIP_PYTHON_SCRIPTS' in os.environ:
     kwargs['name'] += '_modules'
-    kwargs['scripts'] = {}
+    kwargs['entry_points'] = {}
 
 setup(**kwargs)
diff --git a/scripts/rosdep-source b/src/rosdep2/install.py
old mode 100755
new mode 100644
similarity index 93%
rename from scripts/rosdep-source
rename to src/rosdep2/install.py
index 8b89e9762..068085150
--- a/scripts/rosdep-source
+++ b/src/rosdep2/install.py
@@ -39,7 +39,7 @@
 from rosdep2 import InstallFailed
 from rosdep2.platforms import source
 
-NAME='rosdep-source'
+NAME = 'rosdep-source'
 
 
 def install_main():
@@ -49,16 +49,12 @@ def install_main():
         parser.error("please specify one and only one rdmanifest url")
     if args[0] != 'install':
         parser.error("currently only support the 'install' command")
-    rdmanifest_url= args[1]
+    rdmanifest_url = args[1]
     try:
         if os.path.isfile(rdmanifest_url):
             source.install_from_file(rdmanifest_url)
         else:
             source.install_from_url(rdmanifest_url)
     except InstallFailed as e:
-        print("ERROR: installation failed:\n%s"%e, file=sys.stderr)
+        print("ERROR: installation failed:\n%s" % e, file=sys.stderr)
         sys.exit(1)
-
-
-if __name__ == '__main__':
-    install_main()