diff --git a/.cvsignore b/.cvsignore
index 5d31034..2312b4f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXfixes-4.0.3.tar.bz2
+libXfixes-4.0.4.tar.bz2
diff --git a/libXfixes.spec b/libXfixes.spec
index e209029..daed23d 100644
--- a/libXfixes.spec
+++ b/libXfixes.spec
@@ -1,7 +1,7 @@
 Summary: X Fixes library
 Name: libXfixes
-Version: 4.0.3
-Release: 9%{?dist}
+Version: 4.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: libX11-devel
-BuildRequires: xorg-x11-proto-devel >= 7.0-7
+BuildRequires: pkgconfig(fixesproto) pkgconfig(xext)
 
 %description
 X Fixes library.
@@ -21,29 +20,20 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
-# xfixes.pc Requires: xproto fixesproto >= 4.0
-Requires: xorg-x11-proto-devel >= 7.0-7
-
 %description devel
 libXfixes development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -63,14 +53,14 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/Xfixes.h
-%if %{with_static}
-%{_libdir}/libXfixes.a
-%endif
 %{_libdir}/libXfixes.so
 %{_libdir}/pkgconfig/xfixes.pc
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 4.0.4-1
+- libXfixes 4.0.4
+
 * Thu Oct 08 2009 Parag <paragn@fedoraproject.org> - 4.0.3-9
 - Merge-Review #226071
 - Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes
diff --git a/sources b/sources
index a672735..a983d6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1990d19725a3c7f32290037f02d3737f  libXfixes-4.0.3.tar.bz2
+7f2c40852eb337b237ad944ca5c30d49  libXfixes-4.0.4.tar.bz2