diff --git a/setup.py b/setup.py
index 07cc9cf..f7fb30e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,14 +2,33 @@
 
 from distutils.core import setup
 
-setup(name = 'pyst',
-      version = '0.2',
-      description = 'Asterisk related utility modules.',
-      author = 'Karl Putland',
-      author_email = 'kputland@users.sourceforge.net',
-      url = 'http://www.sourceforge.net/projects/pyst/',
-      packages = ['asterisk'],
-      license = 'Python Software Foundation License (agitb), Lesser General Public License',
-      platforms = 'UNIX',
-     )
-      
+try :
+    from asterisk.Version  import VERSION
+except :
+    VERSION = None
+
+description = []
+f = open ('README')
+logo_stripped = False
+for line in f :
+    if not logo_stripped and line.strip () :
+        continue
+    logo_stripped = True
+    description.append (line)
+
+licenses = ( 'Python Software Foundation License (agitb)'
+           , 'GNU Library or Lesser General Public License (LGPL)'
+           )
+
+setup \
+    ( name = 'pyst'
+    , version = VERSION
+    , description = 'A Python Interface to Asterisk'
+    , long_description = ''.join (description)
+    , author = 'Karl Putland'
+    , author_email = 'kputland@users.sourceforge.net'
+    , url = 'http://www.sourceforge.net/projects/pyst/'
+    , packages = ['asterisk']
+    , license = ', '.join (licenses)
+    , platforms = 'UNIX'
+    )