diff --git a/xcb-proto.changes b/xcb-proto.changes
index 08d4b4c..5cc94c7 100644
--- a/xcb-proto.changes
+++ b/xcb-proto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  1 15:09:24 UTC 2017 - mpluskal@suse.com
+
+- Build both python2 and python3 versions
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Thu May 19 09:31:46 UTC 2016 - sndirsch@suse.com
 
diff --git a/xcb-proto.spec b/xcb-proto.spec
index 0b7c166..2b28281 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xcb-proto
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,84 +17,93 @@
 
 
 %define dirsuffix 1.12
-
 Name:           xcb-proto
 Version:        7.6_%{dirsuffix}
 Release:        0
-Url:            http://xorg.freedesktop.org/
 Summary:        The X11 Protocol: X Protocol C Bindings
 License:        X11
 Group:          Development/Libraries/X11
-
+Url:            http://xorg.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/proto/xcb-proto
 #Git-Web:	http://cgit.freedesktop.org/xorg/proto/xcb-proto/
-Source:         http://xorg.freedesktop.org/archive/individual/xcb/%name-%dirsuffix.tar.bz2
+Source:         http://xorg.freedesktop.org/archive/individual/xcb/%{name}-%{dirsuffix}.tar.bz2
 BuildRequires:  autoconf >= 2.57
 BuildRequires:  automake
 BuildRequires:  fdupes
-#BuildRequires:  pkgconfig(xorg-macros) >= 1.3
-BuildRequires:  pkg-config
-BuildRequires:  python-base
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
+BuildRequires:  python2-devel
+BuildRequires:  python3-devel
 
 %description
-The XCB protocol headers for X11 development.
-xcb-proto provides the XML-XCB protocol descriptions that libxcb uses to
-generate the majority of its code and API.
+The XCB protocol headers for X11 development. xcb-proto provides the
+XML-XCB protocol descriptions that libxcb uses to generate the majority of
+its code and API.
 
 %package devel
 Summary:        The X11 Protocol: X Protocol C Bindings
 Group:          Development/Libraries/X11
-
-Requires:       python-xcb-proto-devel = %{version}
-
-# Added within the 13.2 Development Cycle
-#Provides:       xorg-x11-proto-devel:%_libdir/pkgconfig/xcb-proto.pc
+Requires:       python3-xcb-proto-devel = %{version}
 Provides:       xorg-x11-proto-devel = 7.6
 Obsoletes:      xorg-x11-proto-devel <= 7.6
 
 %description devel
-The XCB protocol headers for X11 development.
-xcb-proto provides the XML-XCB protocol descriptions that libxcb uses to
-generate the majority of its code and API.
+The XCB protocol headers for X11 development. xcb-proto provides the
+XML-XCB protocol descriptions that libxcb uses to generate the majority of
+its code and API.
 
-%package -n python-xcb-proto-devel
+%package -n python2-xcb-proto-devel
 Summary:        Python libraries mandatory for XML-XCB Development
 Group:          Development/Libraries/X11
-Requires:       python-base = %{py_ver}
+Provides:       python-xcb-proto-devel = %{version}-%{release}
+Obsoletes:      python-xcb-proto-devel < %{version}-%{release}
 Provides:       python-xcb-proto-devel = 7.6
 Obsoletes:      python-xcb-proto-devel <= 7.6
 
-%description -n python-xcb-proto-devel
-Language-independent Python
-libraries that used to parse an XML description and create objects
-used by Python code generators in individual language bindings.
+%description -n python2-xcb-proto-devel
+Language-independent Python libraries that used to parse an XML description
+and create objects used by Python code generators in individual language
+bindings.
+
+%package -n python3-xcb-proto-devel
+Summary:        Python libraries mandatory for XML-XCB Development
+Group:          Development/Libraries/X11
+
+%description -n python3-xcb-proto-devel
+Language-independent Python libraries that used to parse an XML description
+and create objects used by Python code generators in individual language
+bindings.
 
 %prep
 %setup -q -n %{name}-%{dirsuffix}
 
 %build
-autoreconf -fi
+autoreconf -fiv
+# In order to build both python2 and python3 version we need to run
+# configure and install twice
+export PYTHON="python2"
 %configure
 make %{?_smp_mflags}
+%make_install
+
+export PYTHON="python3"
+%configure
+make %{?_smp_mflags}
+%make_install
 
 %install
-make install DESTDIR="%buildroot"
-%fdupes -s %buildroot/%_prefix
+%fdupes -s %{buildroot}/%{_prefix}
 
 %files devel
-%defattr(-,root,root)
-%dir %_datadir/xcb
-%doc %_datadir/xcb/*
-%_libdir/pkgconfig/*.pc
+%dir %{_datadir}/xcb
+%doc %{_datadir}/xcb/*
+%{_libdir}/pkgconfig/*.pc
 
-%files -n python-xcb-proto-devel
-%defattr(-,root,root)
+%files -n python2-xcb-proto-devel
 %doc COPYING
-%if %suse_version > 1110
-%python_sitelib/xcbgen/
-%else
-%_libdir/python2.6/site-packages/xcbgen/
-%endif
+%{python_sitelib}/xcbgen/
+
+%files -n python3-xcb-proto-devel
+%doc COPYING
+%{python3_sitelib}/xcbgen/
 
 %changelog