diff --git a/srcpkgs/glibc/patches/glibc-2.20-do_ftell_wide-memleak.patch b/srcpkgs/glibc/patches/glibc-2.20-do_ftell_wide-memleak.patch
new file mode 100644
index 00000000000..91c9ede6691
--- /dev/null
+++ b/srcpkgs/glibc/patches/glibc-2.20-do_ftell_wide-memleak.patch
@@ -0,0 +1,12 @@
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index f123add..ebc06e8 100644
+--- libio/wfileops.c
++++ libio/wfileops.c
+@@ -711,6 +711,7 @@ do_ftell_wide (_IO_FILE *fp)
+ 		return WEOF;
+ 
+ 	      offset += outstop - out;
++	      free (out);
+ 	    }
+ 
+ 	  /* We don't trust _IO_read_end to represent the current file offset
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 074e770721d..1e6638a3bfb 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.20
-revision=3
+revision=4
 bootstrap=yes
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -30,7 +30,8 @@ force_debug_pkgs=yes
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl"
 fi
-makedepends="kernel-libc-headers"
+makedepends="kernel-libc-headers>=3.17"
+build_options="systemd"
 
 do_configure() {
 	mkdir build
@@ -128,7 +129,7 @@ do_install() {
 glibc-devel_package() {
 	lib32depends="glibc>=${version}_${revision}"
 	lib32files="/usr/include/gnu/stubs-32.h"
-	depends="kernel-libc-headers glibc>=${version}_${revision}"
+	depends="${makedepends} glibc>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -152,8 +153,10 @@ nscd_package() {
 	short_desc+=" - Name Service Cache Daemon"
 	pkg_install() {
 		vmove usr/sbin/nscd
-		vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
-		vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf
+		if [ "$build_option_systemd" ]; then
+			vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
+			vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf
+		fi
 		vinstall ${wrksrc}/nscd/nscd.conf 644 etc
 	}
 }