diff --git a/CHANGES b/CHANGES
index e5b95c4..0334167 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Version 0.6:
+- mostly reverted patch 2594366: alsapcm_setup did not do complete error 
+checking for good reasons; some ALSA functions in alsapcm_setup may fail without
+rendering the device unusable
+
 Version 0.5:
 - applied patch 2777035: Fixed setrec method in alsaaudio.c
   This included a mixertest with more features
diff --git a/doc/Makefile b/doc/Makefile
index 2b39d69..40244b8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -73,5 +73,5 @@ linkcheck:
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in linkcheck/output.txt."
 
-install:
+upload: html
 	scp -r ./html/* $(SFUSER),pyalsaaudio@web.sourceforge.net:htdocs
diff --git a/doc/conf.py b/doc/conf.py
index 53b4ade..871504a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -13,6 +13,9 @@
 
 import sys, os
 
+sys.path.append('..')
+from setup import pyalsa_version
+
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
@@ -36,15 +39,15 @@ master_doc = 'index'
 
 # General substitutions.
 project = u'alsaaudio'
-copyright = u'2008, Casper Wilstrup, Lars Immisch'
+copyright = u'2008-2009, Casper Wilstrup, Lars Immisch'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = pyalsa_version
 # The full version, including alpha/beta/rc tags.
-release = '0.4'
+release = pyalsa_version
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 1b5b0b9..fb555d7 100755
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,8 @@ from distutils.core import setup
 from distutils.extension import Extension
 from sys import version
 
+pyalsa_version = '0.6'
+
 # patch distutils if it's too old to cope with the "classifiers" or
 # "download_url" keywords
 from sys import version
@@ -15,30 +17,32 @@ if version < '2.2.3':
     from distutils.dist import DistributionMetadata
     DistributionMetadata.classifiers = None
     DistributionMetadata.download_url = None
-    
-setup(
-    name = 'pyalsaaudio',
-    version = '0.5',
-    description = 'ALSA bindings',
-    long_description = __doc__,
-    author = 'Casper Wilstrup',
-    author_email='cwi@aves.dk',
-    maintainer = 'Lars Immisch',
-    maintainer_email = 'lars@ibp.de',
-    license='PSF',
-    platforms=['posix'],
-    url='http://pyalsaaudio.sourceforge.net/',
-    classifiers = [
-    'Development Status :: 4 - Beta',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: Python Software Foundation License',
-    'Operating System :: POSIX :: Linux',
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 3',    
-    'Topic :: Multimedia :: Sound/Audio',
-    'Topic :: Multimedia :: Sound/Audio :: Mixers',
-    'Topic :: Multimedia :: Sound/Audio :: Players',
-    'Topic :: Multimedia :: Sound/Audio :: Capture/Recording',
-    ],
-    ext_modules=[Extension('alsaaudio',['alsaaudio.c'], libraries=['asound'])]
+
+if __name__ == '__main__':
+    setup(
+        name = 'pyalsaaudio',
+        version = pyalsa_version,
+        description = 'ALSA bindings',
+        long_description = __doc__,
+        author = 'Casper Wilstrup',
+        author_email='cwi@aves.dk',
+        maintainer = 'Lars Immisch',
+        maintainer_email = 'lars@ibp.de',
+        license='PSF',
+        platforms=['posix'],
+        url='http://pyalsaaudio.sourceforge.net/',
+        classifiers = [
+            'Development Status :: 4 - Beta',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: Python Software Foundation License',
+            'Operating System :: POSIX :: Linux',
+            'Programming Language :: Python :: 2',
+            'Programming Language :: Python :: 3',    
+            'Topic :: Multimedia :: Sound/Audio',
+            'Topic :: Multimedia :: Sound/Audio :: Mixers',
+            'Topic :: Multimedia :: Sound/Audio :: Players',
+            'Topic :: Multimedia :: Sound/Audio :: Capture/Recording',
+            ],
+        ext_modules=[Extension('alsaaudio',['alsaaudio.c'], 
+                               libraries=['asound'])]
     )
diff --git a/test.py b/test.py
index 8623bb6..b77df79 100755
--- a/test.py
+++ b/test.py
@@ -67,7 +67,8 @@ class MixerTest(unittest.TestCase):
         mixer.close()
 
     def testMixerClose(self):
-        "Run common Mixer methods on a closed object and verify it raises an error"
+        """Run common Mixer methods on a closed object and verify it raises an 
+        error"""
 
         mixers = alsaaudio.mixers()
         mixer = alsaaudio.Mixer(mixers[0])