diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 49510dc97f0..4793074360b 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,10 +1,10 @@
 # Template file for 'rpi-kernel'
 #
-_githash="2e529746b6de7633ffd02c27c1f70a1df30fe243"
+_githash="b2f16e549532870e0c6fa3b588ad239fd9421702"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=3.18.10
+version=3.18.11
 revision=1
 wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -12,7 +12,7 @@ homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=d7eec494278053832004732e7d9e2669de243435bbff280bcb1cc41ba413276a
+checksum=00fb341a3056e79a8131c39ef4ea14dd22f941b7c1cee3ad2ba73a82d807fced
 
 _kernver="${version}_${revision}"
 
@@ -50,8 +50,10 @@ do_configure() {
 
 	# Use upstream default configuration, no need to maintain ours.
 	if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcm2709_defconfig
 		make ${makejobs} ${_args} ARCH=arm bcm2709_defconfig
 	else
+		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcmrpi_defconfig
 		make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
 	fi