diff --git a/libxcb.spec b/libxcb.spec
index b43ec6f..bb6d4e3 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -1,51 +1,48 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
-Name:           libxcb
-Version:        1.11
-Release:        2%{?dist}
-Summary:        A C binding to the X11 protocol
-
-Group:          System Environment/Libraries
-License:        MIT
-URL:            http://xcb.freedesktop.org/
-Source0:        http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:       libxcb
+Version:    1.11
+Release:    3%{?dist}
+Summary:    A C binding to the X11 protocol
+License:    MIT
+URL:        http://xcb.freedesktop.org/
+
+Source0:    http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
+
 # This is stolen straight from the pthread-stubs source:
 # http://cgit.freedesktop.org/xcb/pthread-stubs/blob/?id=6900598192bacf5fd9a34619b11328f746a5956d
 # we don't need the library because glibc has working pthreads, but we need
 # the pkgconfig file so libs that link against libxcb know this...
-Source1:	pthread-stubs.pc.in
+Source1:    pthread-stubs.pc.in
 
-BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
-BuildRequires:  libXau-devel
+BuildRequires:  libtool
 BuildRequires:  libxslt
-BuildRequires:  xcb-proto >= 1.10
-BuildRequires:  xorg-x11-proto-devel
-BuildRequires:  xorg-x11-util-macros
+BuildRequires:  pkgconfig(xau) >= 0.99.2
+BuildRequires:  pkgconfig(xcb-proto) >= 1.11
+BuildRequires:  pkgconfig(xorg-macros) >= 1.18
+#BuildRequires:  xorg-x11-proto-devel
 
 %description
 The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
 small footprint, latency hiding, direct access to the protocol, improved
 threading support, and extensibility.
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+%package devel
+Summary:    Development files for %{name}
+Requires:   %{name} = %{version}-%{release}
+Requires:   pkgconfig
 
-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+%description devel
+The %{name}-devel package contains libraries and header files for developing
+applications that use %{name}.
 
-%package        doc
-Summary:        Documentation for %{name}
-Group:          Documentation
-BuildArch:	noarch
+%package doc
+Summary:    Documentation for %{name}
+BuildArch:  noarch
 
-%description    doc
+%description doc
 The %{name}-doc package contains documentation for the %{name} library.
 
 %prep
@@ -54,26 +51,28 @@ The %{name}-doc package contains documentation for the %{name} library.
 %build
 sed -i 's/pthread-stubs //' configure.ac
 autoreconf -v --install
-%configure --disable-static --docdir=%{_pkgdocdir} \
-	   --enable-selinux --enable-xkb --disable-xprint
+%configure \
+    --disable-static \
+    --docdir=%{_pkgdocdir} \
+    --enable-selinux \
+    --enable-xkb \
+    --enable-xinput \
+    --disable-xprint
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 644 COPYING NEWS README $RPM_BUILD_ROOT%{_pkgdocdir}
-sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
+sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} \
+    > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_libdir}/libxcb-composite.so.0*
 %{_libdir}/libxcb-damage.so.0*
 %{_libdir}/libxcb-dpms.so.0*
@@ -93,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxcb-xf86dri.so.0*
 %{_libdir}/libxcb-xfixes.so.0*
 %{_libdir}/libxcb-xinerama.so.0*
+%{_libdir}/libxcb-xinput.so.0*
 %{_libdir}/libxcb-xkb.so.1*
 %{_libdir}/libxcb-xselinux.so.0*
 %{_libdir}/libxcb-xtest.so.0*
@@ -101,17 +101,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxcb.so.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/xcb
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*.3*
 
 %files doc
-%defattr(-,root,root,-)
 %{_pkgdocdir}
 
 %changelog
+* Thu Jan 08 2015 Simone Caronni <negativo17@gmail.com> - 1.11-3
+- Clean up SPEC file, fix rpmlint warnings.
+- Enable XInput extension (#1177701).
+
 * Fri Oct 24 2014 Dan Horák <dan@danny.cz> - 1.11-2
 - rebuilt for broken koji db - no buildroot info