diff --git a/debian/changelog b/debian/changelog
index 1c93ee40883212594462a0aed92a94d1e86c7504..d5eede88d5753a89028ebe5b59b35f9ef6a66168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.6.5-13) UNRELEASED; urgency=low
+
+  * Python policy changes for X-Python-Version and X-Python3-Version
+    - Minimum changes for Squeeze
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 10 Aug 2010 22:22:49 -0400
+
 python-defaults (2.6.5-12) unstable; urgency=low
 
   * pycompile: do not hang if interpreters are not started in the same order
diff --git a/debian/python-policy.sgml b/debian/python-policy.sgml
index 25421091a50cf40a354b004ee659443ff30a3047..b798375a557ab47bcc559bd4a51d8c67a6dc18f6 100644
--- a/debian/python-policy.sgml
+++ b/debian/python-policy.sgml
@@ -434,15 +434,17 @@ import foo
       <sect id="specifying_versions">
 	<heading>Specifying Supported Versions</heading>
 	<p>
-	  The optional <tt>XS-Python-Version</tt> field
-	  in the general paragraph (the first one, for the source package) of
-	  <file>debian/control</file> specifies the versions of Python
-	  supported by the source package.  When not specified, it defaults to
-	  all currently supported Python versions.
-
-	  It is notably used to track packages during Python transitions,
-	  and is also used by some packaging scripts to automatically
-	  generate appropriate Depends and Provides lines. The format of the
+	  The optional <tt>X-Python-Version</tt> (preferred) or <tt>
+	  XS-Python-Version</tt> field in the general paragraph (the first one,
+	  for the source package) of <file>debian/control</file> specifies the
+	  versions of Python (not versions of Python 3) supported by the
+	  source package. Similarly, <tt>X-Python3-Version</tt> is used to
+	  specify the versions of Python 3 supported by the package.  When not
+	  specified, they defaults to all currently supported Python (or Python 3)
+	  versions.
+
+	  They are used by some packaging scripts to automatically generate
+	  appropriate Depends and Provides lines. The format of the
 	  field may be one of the following:
 	  <example>
 XS-Python-Version: >= X.Y
@@ -454,12 +456,18 @@ XS-Python-Version: all
 	  version available but might be deprecated in the future since
 	  using version numbers is clearer than "all" and encodes more
 	  information.  The keyword "all" is limited to Python versions and
-	  must be ignored for Python 3 versions.
+	  must be ignored for Python 3 versions. Lists of multiple individual
+	  versions (e.g. 2.4, 2.5, 2.6) work for <tt>XS-Python-Version</tt> and
+	  will continue to be supported, but are not recommended and will not
+	  be supported by <tt>X-Python-Version</tt> or <tt>X-Python3-Version</tt>
+	  after the Squeeze release.
 
 	  The keyword "current" has been deprecated and used to mean that
 	  the package would only have to support a single version (even
 	  across default version changes).  It must be ignored for Python 3
-	  versions.
+	  versions. Python 3 versions should never have been used in
+	  <tt>XS-Python-Version</tt> and should be considered deprecated at best.
+	  <tt>X-Python3-Version</tt> should be used instead.
 	</p>
 	<p>
 	  The binary package paragraphs of your debian/control file should