diff --git a/libX11.changes b/libX11.changes
index bbdf1d6..ed9ffd2 100644
--- a/libX11.changes
+++ b/libX11.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 27 07:50:31 UTC 2018 - tchvatal@suse.com
+
+- Format spec with spec-cleaner
+- Use %autopatch to not bother with one-by-one patch application
+- Remove autoreconf as we no longer patch any of the buildsystem
+- Explicitly disable silent rules during configuration
+
 -------------------------------------------------------------------
 Wed Aug 22 15:09:51 UTC 2018 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/libX11.spec b/libX11.spec
index 2cd7d5b..a7066b2 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -22,22 +22,17 @@ Release:        0
 Summary:        Core X11 protocol client library
 License:        MIT
 Group:          Development/Libraries/C and C++
-Url:            http://xorg.freedesktop.org/
-
+URL:            http://xorg.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/libX11
 #Git-Web:       http://cgit.freedesktop.org/xorg/lib/libX11/
 Source:         http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer
-Patch7:         p_khmer-compose.diff
+Patch0:         p_khmer-compose.diff
 # PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables
-Patch9:         p_xlib_skip_ext_env.diff
+Patch1:         p_xlib_skip_ext_env.diff
 # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
-Patch15:        en-locales.diff
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  autoconf >= 2.60
-BuildRequires:  automake
+Patch2:         en-locales.diff
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -47,7 +42,6 @@ BuildRequires:  pkgconfig(xcb) >= 1.1.92
 BuildRequires:  pkgconfig(xextproto)
 BuildRequires:  pkgconfig(xf86bigfontproto)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.11
-BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(xproto) >= 7.0.13
 BuildRequires:  pkgconfig(xtrans)
 
@@ -64,10 +58,10 @@ stream connection.
 %package -n libX11-6
 Summary:        Core X11 protocol client library
 Group:          System/Libraries
-Requires:       %name-data >= %version
+Requires:       %{name}-data >= %{version}
 # O/P added for 12.2. Ideally remove before 12.2 release.
-Provides:       xorg-x11-libX11 = 7.6_%version-%release
-Obsoletes:      xorg-x11-libX11 < 7.6_%version-%release
+Provides:       xorg-x11-libX11 = 7.6_%{version}-%{release}
+Obsoletes:      xorg-x11-libX11 < 7.6_%{version}-%{release}
 
 %description -n libX11-6
 The X Window System is a network-transparent window system that was
@@ -82,7 +76,7 @@ stream connection.
 %package -n libX11-xcb1
 Summary:        XCB X11 protocol client library
 Group:          System/Libraries
-Requires:       %name-data >= %version
+Requires:       %{name}-data >= %{version}
 
 %description -n libX11-xcb1
 The X Window System is a network-transparent window system that was
@@ -97,9 +91,7 @@ stream connection.
 %package data
 Summary:        Shared data for the Core X11 protocol library
 Group:          System/Libraries
-%if 0%{?suse_version} >= 1130
 BuildArch:      noarch
-%endif
 
 %description data
 The X Window System is a network-transparent window system that was
@@ -114,11 +106,11 @@ stream connection.
 %package devel
 Summary:        Development files for the Core X11 protocol library
 Group:          Development/Libraries/C and C++
-Requires:       libX11-6 = %version
-Requires:       libX11-xcb1 = %version
+Requires:       libX11-6 = %{version}
+Requires:       libX11-xcb1 = %{version}
 # O/P added for 12.2
-Provides:       xorg-x11-libX11-devel = 7.6_%version-%release
-Obsoletes:      xorg-x11-libX11-devel < 7.6_%version-%release
+Provides:       xorg-x11-libX11-devel = 7.6_%{version}-%{release}
+Obsoletes:      xorg-x11-libX11-devel < 7.6_%{version}-%{release}
 
 %description devel
 The X Window System is a network-transparent window system that was
@@ -138,25 +130,22 @@ in libX11-6 and libX11-xcb1.
 # make legal department happy (Bug #153744)
 test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
-#
-%patch7 -p0
-%patch9 -p0
-%patch15 -p0
+
+%autopatch -p0
 
 %build
-# Got patches which change auto*files
-autoreconf -fi
-%configure --docdir=%_docdir/%name --disable-static
-# "--enable-loadable-i18n" is currently broken
-#--datadir=/usr/share
+%configure \
+    --disable-silent-rules \
+    --docdir=%{_docdir}/%{name} \
+    --disable-static
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot"
-rm -f "%buildroot/%_libdir"/*.la
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 # Some files are empty/missing for some UTF-8 locales
-pushd "%buildroot/usr/share/X11/locale"
+pushd "%{buildroot}%{_datadir}/X11/locale"
 for i in *.UTF-8; do
 	echo "$i"
 	if [ "$i" == "en_US.UTF-8" ]; then
@@ -169,34 +158,27 @@ for i in *.UTF-8; do
 done
 popd
 
-%fdupes %buildroot/%_mandir
+%fdupes %{buildroot}/%{_mandir}
 
 %post   -n libX11-6 -p /sbin/ldconfig
-
 %postun -n libX11-6 -p /sbin/ldconfig
-
 %post   -n libX11-xcb1 -p /sbin/ldconfig
-
 %postun -n libX11-xcb1 -p /sbin/ldconfig
 
 %files -n libX11-6
-%defattr(-,root,root)
-%_libdir/libX11.so.6*
+%{_libdir}/libX11.so.6*
 
 %files -n libX11-xcb1
-%defattr(-,root,root)
-%_libdir/libX11-xcb.so.1*
+%{_libdir}/libX11-xcb.so.1*
 
 %files data
-%defattr(-,root,root)
-%_datadir/X11
+%{_datadir}/X11
 
 %files devel
-%defattr(-,root,root)
-%_includedir/X11/*
-%_libdir/*.so
-%_libdir/pkgconfig/*.pc
-%_docdir/%name
-%_mandir/man?/*
+%{_includedir}/X11/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_docdir}/%{name}
+%{_mandir}/man?/*
 
 %changelog