diff --git a/MANIFEST.in b/MANIFEST.in
index a7faa283c48c67e13a55a64eed6462baeb8ae3b9..ec107b26fd604b3b1c02c228ca4d87279234c957 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,6 +15,7 @@ include spfquery.py
 include test.py
 include sample.py
 include test/*
+include Milter/*.py
 include *.spec
 include start.sh
 include milter.rc
diff --git a/setup.py b/setup.py
index 775cee78417ad8417fad45bd1f47b88d9ddee0f3..2d80f2f02c705261a995f08b29736ebce5840439 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,8 @@ querying SPF records.
 	maintainer_email="stuart@bmsi.com",
 	license="GPL",
 	url="http://www.bmsi.com/python/milter.html",
-	py_modules=["Milter","mime","spf"],
+	py_modules=["mime","spf"],
+	packages = ['Milter'],
 	ext_modules=[
 	  Extension("milter", ["miltermodule.c"],
 	    libraries=libs,
@@ -42,6 +43,7 @@ querying SPF records.
 	  'Natural Language :: English',
 	  'Operating System :: POSIX',
 	  'Programming Language :: Python',
-	  'Topic :: Communications :: Email :: Mail Transport Agents'
+	  'Topic :: Communications :: Email :: Mail Transport Agents',
+	  'Topic :: Communications :: Email :: Filters'
 	]
 )