diff --git a/install_all.sh b/install_all.sh
index 24dbac8..0631771 100644
--- a/install_all.sh
+++ b/install_all.sh
@@ -27,8 +27,6 @@ fi
 tar -xf $1
 pushd linux-${kernel_dir}
 cp Makefile $header_dir
-# header export for unicore32 in 2.6.39 is broken, disable it
-sed -i -e 's/cris/cris\|unicore32/' scripts/headers.sh
 /usr/bin/make O="$header_dir" headers_install_all
 # kvm.h and aout.h are only installed if SRCARCH is an architecture
 # that has support for them. As the package is noarch we need to make
@@ -38,26 +36,30 @@ popd
 pushd "$header_dir"
 for asm in \
 	alpha \
-	avr32 \
+	arc \
 	blackfin \
+	c6x \
 	cris \
 	frv \
 	h8300 \
+	hexagon \
 	m32r \
-	m68knommu \
-	mips \
+	metag \
+	microblaze \
 	mn10300 \
+	nios2 \
+	openrisc \
+	score \
 	sh \
-	sh64 \
-	v850 \
+	tile \
+	unicore32 \
 	xtensa \
-        unicore32 \
 ; do
-	rm -rf usr/include/asm-$asm
+	rm -rf usr/include/arch-$asm
 done
-rm Makefile
-find -type f -name "..install.cmd" -print0 | xargs -0 --no-run-if-empty rm
-find -type f -name ".install" -print0 | xargs -0 --no-run-if-empty rm
+rm Makefile .cache.mk
+find -type f -name "..install.cmd" -exec rm {} +
+find -type f -name ".install" -exec rm {} +
 #-------------------------------------------------------------------
 #Fri Sep  5 10:43:49 CEST 2008 - matz@suse.de
 
diff --git a/linux-glibc-devel-4.15.tar.xz b/linux-glibc-devel-4.15.tar.xz
deleted file mode 100644
index 3366997..0000000
--- a/linux-glibc-devel-4.15.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b365fa0d682cc516c48118c812fa03360ce0876ed98d8c4a66ebc39c2f506e67
-size 1175304
diff --git a/linux-glibc-devel-4.16.tar.xz b/linux-glibc-devel-4.16.tar.xz
new file mode 100644
index 0000000..9dce365
--- /dev/null
+++ b/linux-glibc-devel-4.16.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60ec2e311b912049c135f74d4843396494e88e1a7cf92b60c1f963916911892c
+size 1067292
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index d8f213c..4859194 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr  1 22:25:52 UTC 2018 - schwab@suse.de
+
+- Update to kernel headers 4.16
+
 -------------------------------------------------------------------
 Mon Jan 29 10:17:33 UTC 2018 - schwab@suse.de
 
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index 589914d..cfb1fcd 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -18,10 +18,10 @@
 
 Name:           linux-glibc-devel
 Summary:        Linux headers for userspace development
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Development/Libraries/C and C++
 BuildArch:      noarch
-Version:        4.15
+Version:        4.16
 Release:        0
 Url:            http://www.kernel.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build