diff --git a/.gitignore b/.gitignore
index 0842550..0b588fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xcb-util-0.3.9.tar.bz2
+SOURCES/xcb-util-0.4.0.tar.bz2
diff --git a/.xcb-util.metadata b/.xcb-util.metadata
index dfbb34a..110d62d 100644
--- a/.xcb-util.metadata
+++ b/.xcb-util.metadata
@@ -1 +1 @@
-02060d8e2e70838fc41cd3a27c7f2909090d8c20 SOURCES/xcb-util-0.3.9.tar.bz2
+7f2e9b7efcc2c34eb1d6ae312c3d73b075832e46 SOURCES/xcb-util-0.4.0.tar.bz2
diff --git a/SPECS/xcb-util.spec b/SPECS/xcb-util.spec
index bb6306b..6fb5914 100644
--- a/SPECS/xcb-util.spec
+++ b/SPECS/xcb-util.spec
@@ -1,14 +1,12 @@
Name: xcb-util
-Version: 0.3.9
-Release: 4%{?dist}
+Version: 0.4.0
+Release: 2%{?dist}
Summary: Convenience libraries sitting on top of libxcb
-
Group: System Environment/Libraries
License: MIT
URL: http://xcb.freedesktop.org
Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-BuildRequires: gperf, pkgconfig, libxcb-devel >= 1.4, m4, xorg-x11-proto-devel
-BuildRequires: chrpath
+BuildRequires: pkgconfig(xcb) >= 1.4
%description
@@ -23,7 +21,8 @@ the X protocol but which have traditionally been provided by Xlib.
%package devel
Summary: Development and header files for xcb-util
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
+Requires: %{name}%{?isa} = %{version}-%{release}
+
%description devel
Development files for xcb-util.
@@ -33,24 +32,16 @@ Development files for xcb-util.
%build
-%configure --with-pic --disable-static
-
+%configure --with-pic --disable-static --disable-silent-rules
make %{?_smp_mflags}
%check
-
make check
%install
-rm -rf %{buildroot}
-
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-
-# remove RPATH
-chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-*.so.*
-
+make install DESTDIR=%{buildroot} INSTALL="install -p"
rm %{buildroot}%{_libdir}/*.la
@@ -60,28 +51,36 @@ rm %{buildroot}%{_libdir}/*.la
%postun -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
-%doc README
+%doc README COPYING
%{_libdir}/libxcb-util.so.1*
+
%files devel
-%defattr(-,root,root,-)
+%doc NEWS
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
%{_includedir}/xcb/*.h
%changelog
-* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.3.9-4
-- Mass rebuild 2014-01-24
+* Wed Oct 22 2014 Thomas Moschny <thomas.moschny@gmx.de> - 0.4.0-2
+- Move NEWS to -devel.
+
+* Wed Oct 22 2014 Thomas Moschny <thomas.moschny@gmx.de> - 0.4.0-1
+- Update to 0.4.0.
+- Modernize spec file.
+- Include COPYING.
+- Update requirements.
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.3.9-3
-- Mass rebuild 2013-12-27
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild