diff --git a/MANIFEST.in b/MANIFEST.in
index 14a8d0c..d00c7f5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,9 @@
 include LICENSE
 include README.rst
 recursive-include scripts *
+include atrcopy/templates/*
+include test_data/dos*atr
+include test_data/sd*atr
+include test_data/*.xex
+include test_data/rebuild.sh
+include test_data/create_binary.py
diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index 8b9ef7b..7850e11 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -1,11 +1,11 @@
-__version__ = "4.0.0"
-
 import os
 import sys
 
 import logging
 log = logging.getLogger(__name__)
 
+from _metadata import __version__
+
 try:
     import numpy as np
 except ImportError:
diff --git a/atrcopy/_metadata.py b/atrcopy/_metadata.py
new file mode 100644
index 0000000..64982a8
--- /dev/null
+++ b/atrcopy/_metadata.py
@@ -0,0 +1,5 @@
+__version__ = "4.0"
+__author__ = "Rob McMullen"
+__author_email__ = "feedback@playermissile.com"
+__url__ = "https://github.com/robmcmullen/atrcopy"
+__bug_report_url__ = "https://github.com/robmcmullen/atrcopy/issues"
diff --git a/setup.py b/setup.py
index 93f1961..3e32c87 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import sys
 
 try:
@@ -7,20 +5,7 @@ try:
 except ImportError:
     from distutils.core import setup
 
-try:
-    import atrcopy
-    version = atrcopy.__version__
-except RuntimeError, e:
-    # If numpy isn't present, pull the version number from the error string
-    version = str(e).split()[1]
-
-classifiers = [
-    "Programming Language :: Python :: 2",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: GNU General Public License (GPL)",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Utilities",
-]
+execfile('atrcopy/_metadata.py')
 
 with open("README.rst", "r") as fp:
     long_description = fp.read()
@@ -31,17 +16,27 @@ else:
     scripts = ["scripts/atrcopy"]
 
 setup(name="atrcopy",
-      version=version,
-      author="Rob McMullen",
-      author_email="feedback@playermissile.com>",
-      url="https://github.com/robmcmullen/atrcopy",
-      packages=["atrcopy"],
-      scripts=scripts,
-      description="Disk image utilities for Atari 8-bit emulators",
-      long_description=long_description,
-      license="GPL",
-      classifiers=classifiers,
-      install_requires = [
-          'numpy',
-          ],
-      )
+        version=__version__,
+        author=__author__,
+        author_email=__author_email__,
+        url=__url__,
+        packages=["atrcopy"],
+        include_package_data=True,
+        scripts=scripts,
+        description="Utility to manage file systems on Atari 8-bit (DOS 2, DOS 3) and Apple ][ (DOS 3.3) disk images.",
+        long_description=long_description,
+        license="GPL",
+        classifiers=[
+            "Programming Language :: Python :: 2",
+            "Intended Audience :: Developers",
+            "License :: OSI Approved :: GNU General Public License (GPL)",
+            "Topic :: Software Development :: Libraries",
+            "Topic :: Utilities",
+        ],
+        install_requires = [
+            'numpy',
+        ],
+        tests_require = [
+            'pytest',
+        ],
+    )