diff --git a/xcb-proto.changes b/xcb-proto.changes
index 125f4af..fb65311 100644
--- a/xcb-proto.changes
+++ b/xcb-proto.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 18 11:33:19 UTC 2014 - jengelh@inai.de
+
+- Update description and other metadata
+- Use full %configure for build, and remove CFLAGS (nothing is
+  compiled)
+- Make file list more compact
+
 -------------------------------------------------------------------
 Tue Aug  5 23:04:04 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/xcb-proto.spec b/xcb-proto.spec
index 901adb2..f769536 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -21,38 +21,42 @@
 Name:           xcb-proto
 Version:        7.6_%{dirsuffix}
 Release:        0
-BuildRequires:  pkg-config
-BuildRequires:  python-base
+Url:            http://xorg.freedesktop.org/
+Summary:        The X11 Protocol: X Protocol C Bindings
+License:        X11
+Group:          Development/Libraries/X11
 
-BuildRequires:  autoconf >= 2.60
+#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
+BuildRequires:  autoconf >= 2.57
 BuildRequires:  automake
 BuildRequires:  fdupes
-BuildRequires:  libtool
-
-Url:            http://xorg.freedesktop.org/
+#BuildRequires:  pkgconfig(xorg-macros) >= 1.3
+BuildRequires:  pkg-config
+BuildRequires:  python-base
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        The X Protocol
-License:        X11
-Group:          Development/Libraries/X11 
-#Source URL:    http://xorg.freedesktop.org/archive/individual/xcb/
-Source:         %{name}-%{dirsuffix}.tar.bz2
 
 %description
-The XCB Protocol Headers for X development
+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 %{name}-devel
-Summary:        The X Protocol
+%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://usr/%{_lib}/pkgconfig/xcb-proto.pc
+#Provides:       xorg-x11-proto-devel:%_libdir/pkgconfig/xcb-proto.pc
 Provides:       xorg-x11-proto-devel = 7.6
 Obsoletes:      xorg-x11-proto-devel <= 7.6
 
-%description -n %{name}-devel
-The XCB Protocol Headers for X development
+%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.
 
 %package -n python-xcb-proto-devel
 Summary:        Python libraries mandatory for XML-XCB Development
@@ -69,24 +73,18 @@ used by Python code generators in individual language bindings.
 
 %build
 autoreconf -fi
-./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-              --prefix=/usr --libdir=%{_libdir}
+%configure
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR="%buildroot"
+%fdupes -s %buildroot/%_prefix
 
-%if %suse_version > 1110
-%fdupes -s $RPM_BUILD_ROOT/%python_sitelib/xcbgen/
-%else
-%fdupes -s $RPM_BUILD_ROOT/usr/%{_lib}/python2.6/site-packages/xcbgen/
-%endif
-
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
-%dir /usr/share/xcb
-%doc /usr/share/xcb/*
-/usr/%{_lib}/pkgconfig/*.pc
+%dir %_datadir/xcb
+%doc %_datadir/xcb/*
+%_libdir/pkgconfig/*.pc
 
 %files -n python-xcb-proto-devel
 %defattr(-,root,root)
@@ -94,7 +92,7 @@ make install DESTDIR="%buildroot"
 %if %suse_version > 1110
 %python_sitelib/xcbgen/
 %else
-/usr/%{_lib}/python2.6/site-packages/xcbgen/
+%_libdir/python2.6/site-packages/xcbgen/
 %endif
 
 %changelog