diff --git a/debian/changelog b/debian/changelog
index bfe101359a75e79d780bca862377360dc3d968b7..e7055133513cf816ab2127850c944112697b1a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 python-defaults (2.6.5-3) UNRELEASED; urgency=low
 
-  * 
+  * Remove '-V' option from pyclean call in runtime.d/public_modules.rtremove
 
- -- Matthias Klose <doko@debian.org>  Fri, 18 Jun 2010 00:07:51 +0200
+ -- Piotr Ożarowski <piotr@debian.org>  Fri, 18 Jun 2010 10:25:59 +0200
 
 python-defaults (2.6.5-2) unstable; urgency=low
 
diff --git a/dh_python2 b/dh_python2
index 857bdf349d36ae8a8c90d8cb2a8d6653baba0468..3a3e6ad5a93aa7cf3c2605f3964e5df6f67e6928 100755
--- a/dh_python2
+++ b/dh_python2
@@ -594,11 +594,14 @@ def main():
             dh.autoscript(package, 'postinst', 'postinst-pycompile', args)
 
         pydist_file = join('debian', "%s.pydist" % package)
-        if exists(pydist_file) and validate_pydist(pydist_file, True):
-            dstdir = join('debian', package, 'usr/share/python/dist/')
-            if not exists(dstdir):
-                os.makedirs(dstdir)
-            fcopy(pydist_file, join(dstdir, package))
+        if exists(pydist_file):
+            if not validate_pydist(pydist_file, True):
+                log.warning("%s.pydist file is invalid", package)
+            else:
+                dstdir = join('debian', package, 'usr/share/python/dist/')
+                if not exists(dstdir):
+                    os.makedirs(dstdir)
+                fcopy(pydist_file, join(dstdir, package))
 
     dh.save()
 
diff --git a/runtime.d/public_modules.rtremove b/runtime.d/public_modules.rtremove
index 94569a47aa7a4f17ecefcf167c69f9f0be1b5f88..87b5a43e3f7f8504dd8bc75ceceea09c265f65d9 100755
--- a/runtime.d/public_modules.rtremove
+++ b/runtime.d/public_modules.rtremove
@@ -2,7 +2,7 @@
 
 VERSION=${2#python}
 if which python >/dev/null 2>&1 && which pyclean >/dev/null 2>&1; then
-	pyclean -V $VERSION /usr/lib/python$VERSION/
+	pyclean /usr/lib/python$VERSION/
 else
 	find /usr/lib/python$VERSION/ -name '*.py[co]' -delete
 fi