Index: /pyyaml/trunk/lib/yaml/__init__.py
===================================================================
--- /pyyaml/trunk/lib/yaml/__init__.py (revision 258)
+++ /pyyaml/trunk/lib/yaml/__init__.py (revision 275)
@@ -11,6 +11,7 @@
 try:
     from cyaml import *
+    with_libyaml = True
 except ImportError:
-    pass
+    with_libyaml = False
 
 def scan(stream, Loader=Loader):
Index: /pyyaml/trunk/setup.py
===================================================================
--- /pyyaml/trunk/setup.py (revision 254)
+++ /pyyaml/trunk/setup.py (revision 275)
@@ -1,5 +1,5 @@
 
 NAME = 'PyYAML'
-VERSION = '3.05'
+VERSION = '3.06'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
@@ -22,5 +22,5 @@
 DOWNLOAD_URL = "http://pyyaml.org/download/pyyaml/%s-%s.tar.gz" % (NAME, VERSION)
 CLASSIFIERS = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
@@ -31,5 +31,5 @@
 ]
 
-from distutils.core import setup
+from setuptools import setup, Extension, Feature
 
 if __name__ == '__main__':
@@ -50,4 +50,13 @@
         package_dir={'': 'lib'},
         packages=['yaml'],
+
+        features = {
+            'libyaml': Feature(
+                description="LibYAML bindings",
+                ext_modules=[
+                    Extension('_yaml', ['ext/_yaml.pyx'], libraries=['yaml']),
+                ],
+            ),
+        },
     )
 
Index: /yaml/trunk/setup_with_libyaml.py
===================================================================
--- /pyyaml/trunk/setup_with_libyaml.py (revision 227)
+++  (revision )
@@ -1,31 +1,0 @@
-
-from setup import *
-
-from distutils.core import setup
-from distutils.extension import Extension
-from Pyrex.Distutils import build_ext
-
-if __name__ == '__main__':
-
-    setup(
-        name=NAME,
-        version=VERSION,
-        description=DESCRIPTION,
-        long_description=LONG_DESCRIPTION,
-        author=AUTHOR,
-        author_email=AUTHOR_EMAIL,
-        license=LICENSE,
-        platforms=PLATFORMS,
-        url=URL,
-        download_url=DOWNLOAD_URL,
-        classifiers=CLASSIFIERS,
-
-        package_dir={'': 'lib'},
-        packages=['yaml'],
-        ext_modules=[
-            Extension("_yaml", ["ext/_yaml.pyx"], libraries=['yaml']),
-        ],
-
-        cmdclass = {'build_ext': build_ext}
-    )
-