diff --git a/install_all.sh b/install_all.sh
index 30d8a09..24dbac8 100644
--- a/install_all.sh
+++ b/install_all.sh
@@ -66,7 +66,7 @@ find -type f -name ".install" -print0 | xargs -0 --no-run-if-empty rm
 #
 rm -rf usr/include/drm/
 # Remove confusing empty uapi directory
-rmdir usr/include/uapi
+test ! -d usr/include/uapi || rmdir usr/include/uapi
 for dir in *
 do
 	case "$dir" in
diff --git a/linux-glibc-devel-4.11.tar.xz b/linux-glibc-devel-4.11.tar.xz
deleted file mode 100644
index 2eb5eff..0000000
--- a/linux-glibc-devel-4.11.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:641d268f7354da0679afb3ae2019b4d53cb93a0c89df9668524c6e371a91702b
-size 1026568
diff --git a/linux-glibc-devel-4.12.tar.xz b/linux-glibc-devel-4.12.tar.xz
new file mode 100644
index 0000000..000beb2
--- /dev/null
+++ b/linux-glibc-devel-4.12.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f1f547ad0056dc2b5f58f9eae1011e1dac49edb9f1729cc49ea6535e820bd72
+size 1132108
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index f9f9631..996628b 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  3 08:04:22 UTC 2017 - schwab@suse.de
+
+- Update to kernel headers 4.12
+
 -------------------------------------------------------------------
 Tue May 16 12:49:44 UTC 2017 - schwab@suse.de
 
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index 3553c32..737b40e 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -21,7 +21,7 @@ Summary:        Linux headers for userspace development
 License:        GPL-2.0
 Group:          Development/Libraries/C and C++
 BuildArch:      noarch
-Version:        4.11
+Version:        4.12
 Release:        0
 Url:            http://www.kernel.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -147,7 +147,7 @@ then
 	echo "/usr/include/asm is a directory, waiting for triggerpostun to symlink to asm-$asm_link"
 	exit 0
 fi
-ln -sfn asm-$asm_link usr/include/asm
+ln -sfn arch-$asm_link/asm usr/include/asm
 exit 0
 
 %triggerpostun -- linux-kernel-headers, glibc-devel < 2.5, libc < 2.2
@@ -165,7 +165,7 @@ case "$(uname -m)" in
   	m68k)    asm_link=m68k       ;;
 	*)       asm_link=x86  ;;
 esac
-ln -sfn asm-$asm_link usr/include/asm
+ln -sfn arch-$asm_link/asm usr/include/asm
 exit 0
 
 %files