diff --git a/python-polib.changes b/python-polib.changes
index aadb04f..4df9210 100644
--- a/python-polib.changes
+++ b/python-polib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 31 10:59:13 UTC 2012 - saschpe@suse.de
+
+- Resolved spec file conflict
+- Remove obsolete SUSE version check (for 10.1)
+
 -------------------------------------------------------------------
 Tue Aug 16 07:46:58 UTC 2011 - saschpe@suse.de
 
@@ -27,12 +33,3 @@ Sat Aug 13 11:58:29 CEST 2011 - hpj@urpla.net
 Mon Sep 20 15:15:09 UTC 2010 - fcrozat@novell.com
 
 - Release 0.5.3
-
-* Mon Feb 04 2008 - nagappan@gmail.com
-- polib 0.3.1
-* Thu Nov 08 2007 - nagappan@gmail.com
-- Updated URL
-* Wed Nov 07 2007 - nagappan@gmail.com
-- polib 0.3.0
-* Mon Jul 02 2007 - anagappan@novell.com
-- polib 0.1.0
diff --git a/python-polib.spec b/python-polib.spec
index e113c6d..15fdbd6 100644
--- a/python-polib.spec
+++ b/python-polib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-polib
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,29 +16,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           python-polib
 Version:        0.7.0
-Release:        3
+Release:        0
 Url:            http://bitbucket.org/izi/polib/
 Summary:        A library to manipulate gettext files
 License:        MIT
 Group:          Productivity/Other
 Source:         polib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-Sphinx
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1010
 BuildRequires:  fdupes
-%endif
-%if 0%{?suse_version} > 1110
+BuildRequires:  python-Sphinx
+BuildRequires:  python-devel
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
 BuildArch:      noarch
 %endif
-%endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 polib allows you to manipulate, create, modify gettext catalogs (.pot, .po and
@@ -51,8 +45,6 @@ functions 'pofile' and 'mofile', and the 4 core classes: POFile, MOFile,
 POEntry and MOEntry for creating new files/entries.
 
 %package doc
-
-
 Summary:        A library to manipulate gettext files
 Group:          Productivity/Other
 Requires:       %{name} = %{version}
@@ -79,9 +71,7 @@ popd
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%if 0%{?suse_version} > 1010
 %fdupes -s %{buildroot}/%{_prefix}
-%endif
 
 %files
 %defattr(-,root,root)