diff --git a/MANIFEST.in b/MANIFEST.in
index c5985a6..f16185e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,11 +4,5 @@ include dkim/tests/data/*
 include README
 include ChangeLog
 include MANIFEST.in
-include dknewkey.py
-include dkimsign.py
-include dkimverify.py
-include arcsign.py
-include arcverify.py
-include dnsplug.py
 include man/*
 include test.py
diff --git a/arcsign.py b/dkim/arcsign.py
similarity index 100%
rename from arcsign.py
rename to dkim/arcsign.py
diff --git a/arcverify.py b/dkim/arcverify.py
similarity index 100%
rename from arcverify.py
rename to dkim/arcverify.py
diff --git a/dkimsign.py b/dkim/dkimsign.py
similarity index 100%
rename from dkimsign.py
rename to dkim/dkimsign.py
diff --git a/dkimverify.py b/dkim/dkimverify.py
similarity index 100%
rename from dkimverify.py
rename to dkim/dkimverify.py
diff --git a/dknewkey.py b/dkim/dknewkey.py
similarity index 100%
rename from dknewkey.py
rename to dkim/dknewkey.py
diff --git a/setup.py b/setup.py
index c8fd019..4294f0b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
 # This has been modified from the original software.
 # Copyright (c) 2011,2012 Scott Kitterman <scott@kitterman.com>
 
-from distutils.core import setup
+from setuptools import setup
 import os
 
 version = "0.8.0"
@@ -39,8 +39,15 @@ verification.""",
     url = "https://launchpad.net/dkimpy",
     license = "BSD-like",
     packages = ["dkim"],
-    scripts = ["arcsign.py", "arcverify.py", "dknewkey.py", "dkimsign.py",
-        "dkimverify.py"],
+    entry_points = {
+        'console_scripts' : [
+            'arcsign = dkim.arcsign',
+            'arverify = dkim.arcverify',
+            'dkimgsign = dkim.dkimsign',
+            'dkimverify = dkim.dkimverify',
+            'dknewkey = dkim.dknewkey'
+        ],
+    },
     data_files = [(os.path.join('share', 'man', 'man1'),
         ['man/arcsign.1']), (os.path.join('share', 'man', 'man1'),
         ['man/arcverify.1']),(os.path.join('share', 'man', 'man1'),