diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..1632f8036
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+# Exclude tests from the source distribution. They require resources
+# that make the distribution heavier than it needs to be.
+prune test
+
diff --git a/beets/mediafile.py b/beets/mediafile.py
index 96562321f..76d46ed05 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -14,7 +14,6 @@ tag is present. If no value is available, the value will be false (e.g., zero
 or the empty string)."""
 
 import mutagen
-import os.path
 import datetime
 import re
 
diff --git a/bts.py b/bts
similarity index 100%
rename from bts.py
rename to bts
diff --git a/setup.py b/setup.py
new file mode 100755
index 000000000..4d58d63e8
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+from distutils.core import setup
+
+setup(name='beets',
+      version='0.1',
+      description='music library manager',
+      author='Adrian Sampson',
+      author_email='adrian@radbox.org',
+      url='http://code.google.com/p/beets/',
+      license='GPL',
+      platforms='ALL',
+      long_description="""Beets is a system for managing your music
+      collection.
+      
+      It catalogs a collection in a sqlite database. This allows batch
+      correction of file tags and reorganization into a custom
+      directory structure.
+      
+      It also includes a music player that reimplements the
+      `MPD <http://musicpd.org/>`_ protocol in order to play music from
+      the database.
+      """,
+
+      packages=['beets'],
+      scripts=['bts'],
+
+      requires=['sqlite3', 'mutagen', 'eventlet (>=0.8)'],
+     )
+
diff --git a/test/alltests.py b/test/testall.py
similarity index 100%
rename from test/alltests.py
rename to test/testall.py