diff --git a/srcpkgs/glibc/files/nscd.conf b/srcpkgs/glibc/files/nscd.conf
deleted file mode 100644
index 4c551dd637..0000000000
--- a/srcpkgs/glibc/files/nscd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration file for nscd(8).
-#
-logfile			/var/log/nscd.log
-server-user		nobody
-enable-cache passwd	yes
-enable-cache group	yes
-enable-cache hosts	yes
-enable-cache services	yes
diff --git a/srcpkgs/glibc/files/nscd.service b/srcpkgs/glibc/files/nscd.service
deleted file mode 100644
index 262bb53498..0000000000
--- a/srcpkgs/glibc/files/nscd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-
-[Service]
-ExecStart=/usr/sbin/nscd -d
-ExecStop=/usr/sbin/nscd --shutdown
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Also=nscd.socket
diff --git a/srcpkgs/glibc/files/nscd.socket b/srcpkgs/glibc/files/nscd.socket
deleted file mode 100644
index 9b8da6f39a..0000000000
--- a/srcpkgs/glibc/files/nscd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon Socket
-
-[Socket]
-ListenStream=/var/run/nscd/socket
-
-[Install]
-WantedBy=sockets.target
diff --git a/srcpkgs/glibc/files/nscd.tmpfiles.d b/srcpkgs/glibc/files/nscd.tmpfiles.d
deleted file mode 100644
index b670496349..0000000000
--- a/srcpkgs/glibc/files/nscd.tmpfiles.d
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/run/nscd 0755 root root -
-d /var/db/nscd 0755 root root -
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 6ced21b5cd..1936134c39 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.19
-revision=1
+revision=2
 bootstrap=yes
 # Force creation of -dbg pkg, required by valgrind.
 force_debug_pkgs=yes
@@ -25,8 +25,8 @@ nostrip_files="
 	XBS5_LP64_OFF64"
 conf_files="
 	/etc/rpc
+	/etc/gai.conf
 	/etc/ld.so.conf"
-depends="base-files glibc-locales>=${version}_${revision}"
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl"
@@ -107,6 +107,10 @@ do_install() {
 	case "$XBPS_TARGET_MACHINE" in
 		armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;;
 	esac
+
+	vinstall ${wrksrc}/posix/gai.conf 644 etc
+
+	rm -rf ${DESTDIR}/var/db
 }
 
 glibc-devel_package() {
@@ -136,9 +140,8 @@ nscd_package() {
 	short_desc+=" - Name Service Cache Daemon"
 	pkg_install() {
 		vmove usr/sbin/nscd
-		vinstall ${FILESDIR}/nscd.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/nscd.socket 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/nscd.tmpfiles.d 644 usr/lib/tmpfiles.d nscd.conf
-		vinstall ${FILESDIR}/nscd.conf 644 etc
+		vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
+		vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf
+		vinstall ${wrksrc}/nscd/nscd.conf 644 etc
 	}
 }