diff --git a/python-2.5.2-docdirs.patch b/python-2.5.2-docdirs.patch
new file mode 100644
index 0000000..a29c29a
--- /dev/null
+++ b/python-2.5.2-docdirs.patch
@@ -0,0 +1,30 @@
+--- Lib/pydoc.py
++++ Lib/pydoc.py
+@@ -1626,11 +1626,7 @@
+         for dir in [os.environ.get('PYTHONDOCS'),
+                     homedir and os.path.join(homedir, 'doc'),
+                     os.path.join(execdir, 'doc'),
+-                    '/usr/doc/python-docs-' + split(sys.version)[0],
+-                    '/usr/doc/python-' + split(sys.version)[0],
+-                    '/usr/doc/python-docs-' + sys.version[:3],
+-                    '/usr/doc/python-' + sys.version[:3],
+-                    os.path.join(sys.prefix, 'Resources/English.lproj/Documentation')]:
++                    '/usr/share/doc/packages/python/html']:
+             if dir and os.path.isdir(os.path.join(dir, 'lib')):
+                 self.docdir = dir
+ 
+@@ -1738,11 +1734,9 @@
+         if not self.docdir:
+             self.output.write('''
+ Sorry, topic and keyword documentation is not available because the Python
+-HTML documentation files could not be found.  If you have installed them,
+-please set the environment variable PYTHONDOCS to indicate their location.
+-
+-On the Microsoft Windows operating system, the files can be built by
+-running "hh -decompile . PythonNN.chm" in the C:\PythonNN\Doc> directory.
++HTML documentation files could not be found. You need to install package
++python-doc. If you have installed the docunemtation files manually, please
++set the environment variable PYTHONDOCS to indicate their location.
+ ''')
+             return
+         target = self.topics.get(topic, self.keywords.get(topic))
diff --git a/python-doc.spec b/python-doc.spec
index 6093b37..d44afb4 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -18,7 +18,7 @@ Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.5.1
-Release:        66
+Release:        69
 %define pyver   2.5.2
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
diff --git a/python.changes b/python.changes
index e436056..726c3eb 100644
--- a/python.changes
+++ b/python.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 24 19:37:14 CEST 2008 - matejcik@suse.cz
+
+- proper path for html documentation from python-doc,
+  help text mentioning python-doc package in pydoc
+  (bnc#380942)
+
 -------------------------------------------------------------------
 Wed Apr 16 21:20:07 CEST 2008 - matejcik@suse.cz
 
diff --git a/python.spec b/python.spec
index b9742b9..21ee5ad 100644
--- a/python.spec
+++ b/python.spec
@@ -21,7 +21,7 @@ AutoReqProv:    on
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.5.2
-Release:        14
+Release:        19
 %define       tarname        Python-%{version}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
@@ -43,6 +43,7 @@ Patch30:        python-2.5.1-sqlite.patch
 Patch31:        python-2.5.2-fwrapv.patch
 Patch32:        disable-dns-test.diff
 Patch33:        python-2.5.2-from-string-and-size.patch
+Patch34:        python-2.5.2-docdirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 %define         idle_name         idle
@@ -215,6 +216,7 @@ Python2.x, it is part of the core Python distribution.
 %patch32
 %endif
 %patch33 -p2
+%patch34
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -235,6 +237,7 @@ autoreconf -f -i . Modules/_ctypes/libffi
     --prefix=%{_prefix} \
     --libdir=%{_libdir} \
     --mandir=%{_mandir} \
+    --docdir=%{_docdir}/python \
     --enable-ipv6 \
     --with-fpectl \
     --enable-shared \
@@ -487,6 +490,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Thu Apr 24 2008 matejcik@suse.cz
+- proper path for html documentation from python-doc,
+  help text mentioning python-doc package in pydoc
+  (bnc#380942)
 * Wed Apr 16 2008 matejcik@suse.cz
 - PyString_FromStringAndSize now checks size parameter
   (bnc#379534, CVE-2008-1721)