diff --git a/.gitignore b/.gitignore
index 43a1c8d..5211c2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libcap-ng-0.6.1.tar.gz
 libcap-ng-0.6.2.tar.gz
 libcap-ng-0.6.3.tar.gz
 libcap-ng-0.6.4.tar.gz
+/libcap-ng-0.6.5.tar.gz
diff --git a/libcap-ng-0.6.5-device.patch b/libcap-ng-0.6.5-device.patch
deleted file mode 100644
index 7effd72..0000000
--- a/libcap-ng-0.6.5-device.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urp libcap-ng-0.6.5.orig/utils/filecap.c libcap-ng-0.6.5/utils/filecap.c
---- libcap-ng-0.6.5.orig/utils/filecap.c	2010-06-17 13:19:21.000000000 -0400
-+++ libcap-ng-0.6.5/utils/filecap.c	2010-06-17 14:25:07.000000000 -0400
-@@ -41,12 +41,15 @@ static void usage(void)
- 	exit(1);
- }
- 
--static int check_file(const char *file,
--		const struct stat *sb_unused __attribute__ ((unused)),
--		int flag_unused __attribute__ ((unused)),
-+static int check_file(const char *fpath,
-+		const struct stat *sb,
-+		int typeflag_unused __attribute__ ((unused)),
- 		struct FTW *s_unused __attribute__ ((unused)))
- {
--	int fd = open(file, O_RDONLY);
-+	if (S_ISREG(sb->st_mode) == 0)
-+		return FTW_CONTINUE;
-+
-+	int fd = open(fpath, O_RDONLY);
- 	if (fd >= 0) {
- 		capng_results_t rc;
- 
-@@ -58,7 +61,7 @@ static int check_file(const char *file,
- 				header = 1;
- 				printf("%-20s capabilities\n", "file");
- 			}
--			printf("%s     ", file);
-+			printf("%s     ", fpath);
- 			if (rc == CAPNG_FULL)
- 				printf("full");
- 			else
-@@ -68,7 +71,7 @@ static int check_file(const char *file,
- 		}
- 		close(fd);
- 	}
--	return 0;
-+	return FTW_CONTINUE;
- }
- 
- 
diff --git a/libcap-ng.spec b/libcap-ng.spec
index dd85e61..1837556 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -2,13 +2,12 @@
 
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.6.4
-Release: 4%{?dist}
+Version: 0.6.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://people.redhat.com/sgrubb/libcap-ng
 Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
-Patch1: libcap-ng-0.6.5-device.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
@@ -52,7 +51,6 @@ lets you set the file system based capabilities.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -111,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 03 2010 Steve Grubb <sgrubb@redhat.com> 0.6.5-1
+- New upstream release fixing 2.6.36 kernel header issue
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 8faa341..329a49f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae817cd585ca11db257330b392003ed6  libcap-ng-0.6.4.tar.gz
+759ae1accd9954f3e08c2f94b4ecfcf9  libcap-ng-0.6.5.tar.gz