diff -u openafs-1.4.7.dfsg1/acinclude.m4 openafs-1.4.7.dfsg1/acinclude.m4
--- openafs-1.4.7.dfsg1/acinclude.m4
+++ openafs-1.4.7.dfsg1/acinclude.m4
@@ -608,6 +608,7 @@
 		 LINUX_KMEM_CACHE_CREATE_TAKES_DTOR
 		 LINUX_CONFIG_H_EXISTS
 		 LINUX_COMPLETION_H_EXISTS
+		 LINUX_SEMAPHORE_H_EXISTS
 		 LINUX_DEFINES_FOR_EACH_PROCESS
 		 LINUX_DEFINES_PREV_TASK
 		 LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE
diff -u openafs-1.4.7.dfsg1/src/libafs/MakefileProto.LINUX.in openafs-1.4.7.dfsg1/src/libafs/MakefileProto.LINUX.in
--- openafs-1.4.7.dfsg1/src/libafs/MakefileProto.LINUX.in
+++ openafs-1.4.7.dfsg1/src/libafs/MakefileProto.LINUX.in
@@ -50,7 +50,7 @@
 CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@
 DEFINES = $(COMMON_DEFINES) -DCPU=586
 
-<amd64_linux24 amd64_linux26>
+<amd64_linux24>
 CCFLAGS = $(COMMON_KERN_CFLAGS) -mcmodel=kernel -mno-red-zone
 DEFINES = $(COMMON_DEFINES) 
 
diff -u openafs-1.4.7.dfsg1/src/cf/linux-test4.m4 openafs-1.4.7.dfsg1/src/cf/linux-test4.m4
--- openafs-1.4.7.dfsg1/src/cf/linux-test4.m4
+++ openafs-1.4.7.dfsg1/src/cf/linux-test4.m4
@@ -1022,0 +1023,12 @@
+AC_DEFUN([LINUX_SEMAPHORE_H_EXISTS], [
+  AC_MSG_CHECKING([for linux/semaphore.h existance])
+  AC_CACHE_VAL([ac_cv_linux_semaphore_h_exists], [
+    AC_TRY_KBUILD(
+[#include <linux/semaphore.h>],
+[return;],
+      ac_cv_linux_semaphore_h_exists=yes,
+      ac_cv_linux_semaphore_h_exists=no)])
+  AC_MSG_RESULT($ac_cv_linux_semaphore_h_exists)
+  if test "x$ac_cv_linux_semaphore_h_exists" = "xyes"; then
+    AC_DEFINE([LINUX_SEMAPHORE_H], 1, [define if linux/semaphore.h exists])
+  fi])
diff -u openafs-1.4.7.dfsg1/debian/changelog openafs-1.4.7.dfsg1/debian/changelog
--- openafs-1.4.7.dfsg1/debian/changelog
+++ openafs-1.4.7.dfsg1/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.4.7.dfsg1-5ubuntu1) intrepid; urgency=low
+
+  * Add upstream delta for 2.6.27 support.
+  * Don't use COMMON_KERN_CFLAGS for amd64_linux26.
+
+ -- Björn Torkelsson <torkel@acc.umu.se>  Sat, 30 Aug 2008 20:06:40 +0200
+
 openafs (1.4.7.dfsg1-5) unstable; urgency=low
 
   * Drop support for hppa.  We only have a param file for a 2.4 kernel,
only in patch2:
unchanged:
--- openafs-1.4.7.dfsg1.orig/src/afs/sysincludes.h
+++ openafs-1.4.7.dfsg1/src/afs/sysincludes.h
@@ -108,7 +108,11 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#if defined(LINUX_SEMAPHORE_H)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
 #include <linux/mutex.h>
 #endif