diff --git a/debian/changelog b/debian/changelog
index e263f59156ae3b7fc96bdc777322cb7a84a76812..0a4f91c204495c3550335d989516e6070a537a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.4.3-3) experimental; urgency=low
+
+  * Point to the draft of the reworked Python policy.
+  * Fiy 'pyversions -r current' (Raphael Hertzog).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Jun 2006 13:40:52 +0200
+
 python-defaults (2.4.3-02) experimental; urgency=low
 
   * Really do not build python-doc.
diff --git a/debian/control b/debian/control
index 39ec21a31e2a4248b03b9ff308e7072006cf18a2..cce99b796026b8952b54155f0703b3aa99449c49 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Description: An interactive high-level object-oriented language (default version
 Package: python-minimal
 Architecture: all
 Priority: standard
-Depends: python2.4-minimal (>= 2.4.3), python-central (>= 0.4.7), dpkg (>= 1.13.20)
-Conflicts: python (<= 2.4-1)
+Depends: python2.4-minimal (>= 2.4.3), python-central (>= 0.4.8), dpkg (>= 1.13.20)
+Conflicts: python (<= 2.4-1), python-central (<< 0.4.8)
 Replaces: python (<= 2.4-1)
 Description: A minimal subset of the Python language (default version)
  This package contains the interpreter and some essential modules.  It's used
diff --git a/debian/control.in b/debian/control.in
index 1a07700e831236d7cc252a26c19ccd3176bc7e9d..3b7536072163c4c9ed56db7f2512c7736c5efdc2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,8 +24,8 @@ Description: An interactive high-level object-oriented language (default version
 Package: python-minimal
 Architecture: all
 Priority: standard
-Depends: @PVER@-minimal (>= @PREVVER@), python-central (>= 0.4.7), dpkg (>= 1.13.20)
-Conflicts: python (<= 2.4-1)
+Depends: @PVER@-minimal (>= @PREVVER@), python-central (>= 0.4.8), dpkg (>= 1.13.20)
+Conflicts: python (<= 2.4-1), python-central (<< 0.4.8)
 Replaces: python (<= 2.4-1)
 Description: A minimal subset of the Python language (default version)
  This package contains the interpreter and some essential modules.  It's used
diff --git a/debian/python-policy.sgml b/debian/python-policy.sgml
index 800e9b699f7445d9889228a8345fb1dd2b8ad71d..2f68ca954eb4e12fbaa6dec8129a9f03b7093fd7 100644
--- a/debian/python-policy.sgml
+++ b/debian/python-policy.sgml
@@ -23,6 +23,11 @@
       <version>version 0.3.7.2</version>
 
       <abstract>
+        The Python policy is currently in change; a draft
+         for the new policy can be found
+	  <url id="http://people.debian.org/~piman/python-policy/"
+	  name="here">.
+
 	This document describes the packaging of Python within the
 	Debian GNU/Linux distribution and the policy requirements for
 	packaged Python programs and modules.
diff --git a/debian/pyversions.py b/debian/pyversions.py
index 4817c71ecd7bc65478b5bfbfa767e46f20706855..5ba7d34a94a1b3a850f006ee2dc250f63d93c11c 100644
--- a/debian/pyversions.py
+++ b/debian/pyversions.py
@@ -50,9 +50,9 @@ def supported_versions(version_only=False):
     global _supported_versions
     if not _supported_versions:
         if os.path.exists('/usr/share/python/debian_defaults'):
-            import ConfigParser
-            config = ConfigParser.SafeConfigParser()
-            config.read('/usr/share/python/debian_defaults')
+            from ConfigParser import SafeConfigParser
+            config = SafeConfigParser()
+            config.readfp(file('/usr/share/python/debian_defaults'))
             value = config.get('DEFAULT', 'supported-versions')
             _supported_versions = [s.strip() for s in value.split(',')]
         else:
@@ -92,11 +92,10 @@ def requested_versions(vstring, version_only=False):
     vinfo = parse_versions(vstring)
     supported = supported_versions(version_only=True)
     if len(vinfo) == 1:
-        vkey = vinfo[vinfo.keys()[0]]
         if 'all' in vinfo:
             versions = supported
         elif 'current' in vinfo:
-            versions = [default_version()]
+            versions = [default_version(version_only=True)]
         else:
             versions = vinfo['versions'].intersection(supported)
     elif 'all' in vinfo and 'current' in vinfo:
diff --git a/debian/rules b/debian/rules
index 68e31abab72803aed87ae68bee53633f50e114dd..5d6281c657e03feb772e116ad917ed67509e9dbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,7 @@ clean: control-file
 	        rm -f $$f2; \
 	    fi; \
 	done
+	rm -f debian/*.py[co]
 	dh_clean
 
 stamp-control: