diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index 3ace5c0..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: pyst
-Version: 0.2
-Summary: Asterisk related utility modules.
-Home-page: http://www.sourceforge.net/projects/pyst/
-Author: Karl Putland
-Author-email: kputland@users.sourceforge.net
-License: Python Software Foundation License (agitb), Lesser General Public License
-Description: UNKNOWN
-Platform: UNIX
diff --git a/README b/README
index 3a2b2c0..e58e6a9 100644
--- a/README
+++ b/README
@@ -30,6 +30,13 @@ pythons built-in help facility::
  import asterisk.config
  help (asterisk.config)
 
+Some notes on platforms: We now specify "platforms = 'Any'" in
+``setup.py``. This means, the manager part of the package will probably
+run on any platform. The agi scripts on the other hand are called
+directly on the host where Asterisk is running. Since Asterisk doesn't
+run on windows platforms (and probably never will) the agi part of the
+package can only be run on Asterisk platforms.
+
 Credits
 -------
 
diff --git a/setup.py b/setup.py
index 7721894..251ef48 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,11 @@ for line in f :
     logo_stripped = True
     description.append (line)
 
-licenses = ( 'Python Software Foundation License (agitb)'
+licenses = ( 'Python Software Foundation License'
            , 'GNU Library or Lesser General Public License (LGPL)'
            )
 
+
 setup \
     ( name = 'pyst'
     , version = VERSION
@@ -32,5 +33,20 @@ setup \
     , url = 'http://www.sourceforge.net/projects/pyst/'
     , packages = ['asterisk']
     , license = ', '.join (licenses)
-    , platforms = 'UNIX'
+    , platforms = 'Any'
+    , classifiers =
+        [ 'Development Status :: 5 - Production/Stable'
+        , 'Environment :: Other Environment'
+        , 'Intended Audience :: Developers'
+        , 'Intended Audience :: Telecommunications Industry'
+        , 'Operating System :: OS Independent'
+        , 'Programming Language :: Python'
+        , 'Programming Language :: Python :: 2.4'
+        , 'Programming Language :: Python :: 2.5'
+        , 'Programming Language :: Python :: 2.6'
+        , 'Programming Language :: Python :: 2.7'
+        , 'Topic :: Communications :: Internet Phone'
+        , 'Topic :: Communications :: Telephony'
+        , 'Topic :: Software Development :: Libraries :: Python Modules'
+        ] + ['License :: OSI Approved :: ' + l for l in licenses]
     )