diff --git a/python-doc.spec b/python-doc.spec
index cc834bc..1bb6d61 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -17,7 +17,7 @@ Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.5.1
-Release:        25
+Release:        28
 %define pyver %{version}
 BuildArch:    noarch
 %define       tarname        Python-%{pyver}
diff --git a/python.changes b/python.changes
index 59b97bd..09ac53e 100644
--- a/python.changes
+++ b/python.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep  3 17:57:43 CEST 2007 - matejcik@suse.cz
+
+- replaced fdupes oneliner with %fdupes macro
+- added /usr/bin/python2 symlink (#307097)
+- obsoletes python-elementtree and python-sqlite (#301182)
+  (obsoletes, but doesn't provide - the modules that obsolete those
+  packages are renamed and dependent packages need to be changed)
+
 -------------------------------------------------------------------
 Fri Aug 24 16:42:12 CEST 2007 - bg@suse.de
 
diff --git a/python.spec b/python.spec
index 1bd6784..d0c5520 100644
--- a/python.spec
+++ b/python.spec
@@ -17,10 +17,10 @@ URL:            http://www.python.org/
 License:        X11/MIT, PSF LICENSE AGREEMENT FOR PYTHON 2.3
 Group:          Development/Languages/Python
 Autoreqprov:    on
-Obsoletes:      python-nothreads python21
+Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.5.1
-Release:        29
+Release:        34
 %define       tarname        Python-%{version}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
@@ -264,6 +264,7 @@ make \
 # install site-specific tweaks
 # install -m 644 %{S:12} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}
 install -m 644 %{S:13} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils
+ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python2
 ########################################
 # some cleanups
 ########################################
@@ -273,10 +274,12 @@ for dir in bin include %{_lib} ; do
     ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python
 done
 # replace duplicate .pyo/.pyc with hardlinks
-fdupes -qr1 $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} | \
-    grep '^.*py[oc] .*py[oc] $' | \
-    sed -r 's#^(.*\.py)[oc] .+$#\1c \1o#' | \
-    xargs -L 1 ln -f
+
+%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}
+#fdupes -qr1 $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} | \
+#    grep '^.*py[oc] .*py[oc] $' | \
+#    sed -r 's#^(.*\.py)[oc] .+$#\1c \1o#' | \
+#    xargs -L 1 ln -f
 ########################################
 # documentation
 ########################################
@@ -466,8 +469,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{_bindir}/python
 %attr(755, root, root) %{_bindir}/python%{python_version}
 %attr(755, root, root) %{_bindir}/smtpd.py
+%{_bindir}/python2
 
 %changelog
+* Mon Sep 03 2007 - matejcik@suse.cz
+- replaced fdupes oneliner with %%fdupes macro
+- added /usr/bin/python2 symlink (#307097)
+- obsoletes python-elementtree and python-sqlite (#301182)
+  (obsoletes, but doesn't provide - the modules that obsolete those
+  packages are renamed and dependent packages need to be changed)
 * Fri Aug 24 2007 - bg@suse.de
 - fix build on hppa
 * Fri Aug 03 2007 - jmatejek@suse.cz