diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 19efe41..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libcap
-# $Id: Makefile,v 1.1 2004/09/09 07:21:20 cvsdist Exp $
-NAME := libcap
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/libcap-2.16-headerfix.patch b/libcap-2.16-headerfix.patch
index ae6eb28..d7a1d0b 100644
--- a/libcap-2.16-headerfix.patch
+++ b/libcap-2.16-headerfix.patch
@@ -1,12 +1,13 @@
-diff -up libcap-2.16/libcap/include/sys/capability.h.incfix libcap-2.16/libcap/include/sys/capability.h
---- libcap-2.16/libcap/include/sys/capability.h.incfix	2009-03-22 17:54:02.000000000 +0100
-+++ libcap-2.16/libcap/include/sys/capability.h	2009-03-22 17:54:09.000000000 +0100
-@@ -19,7 +19,7 @@ extern "C" {
-  * information for the user library.
-  */
+diff -up libcap-2.16/libcap/include/sys/capability.h.hfix libcap-2.16/libcap/include/sys/capability.h
+--- libcap-2.16/libcap/include/sys/capability.h.hfix	2009-06-15 14:46:51.000000000 +0200
++++ libcap-2.16/libcap/include/sys/capability.h	2009-06-15 14:47:00.000000000 +0200
+@@ -30,6 +30,9 @@ extern "C" {
+ #define _LINUX_FS_H
+ #define __LINUX_COMPILER_H
+ #define __user
++#define _ASM_X86_SIGCONTEXT_H
++#define _ASM_POWERPC_SIGCONTEXT_H
++#define _SPARC_SIGCONTEXT_H
  
--#include <sys/types.h>
-+#include <linux/types.h>
- #include <stdint.h>
- 
- /*
+ typedef unsigned int __u32;
+ typedef __u32 __le32;
diff --git a/libcap.spec b/libcap.spec
index 7e4e2c9..b894692 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,6 +1,6 @@
 Name: libcap
 Version: 2.16
-Release: 2%{?dist}
+Release: 4%{?dist}.1
 Summary: Library for getting and setting POSIX.1e capabilities
 Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz
 Patch0: libcap-2.16-headerfix.patch
@@ -77,6 +77,15 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Jun 16 2009 Karsten Hopp <karsten@redhat.com> 2.16-4.1
+- update headerfix patch
+
+* Mon Jun 15 2009 Karsten Hopp <karsten@redhat.com> 2.16-4
+- make it build again on 32bit
+
+* Mon Jun 08 2009 Karsten Hopp <karsten@redhat.com> 2.16-3
+- disable headerfix patch (#503927)
+
 * Sun Mar 22 2009 Karsten Hopp <karsten@redhat.com> 2.16-1
 - update, with a fix for rebuild problems