diff --git a/srcpkgs/chroot-gettext/template b/srcpkgs/chroot-gettext/template
deleted file mode 100644
index 1981feb1f39..00000000000
--- a/srcpkgs/chroot-gettext/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template build file for 'chroot-gettext'.
-pkgname=chroot-gettext
-version=0.19.4
-revision=1
-wrksrc="gettext-${version}"
-bootstrap=yes
-conflicts="gettext>=0"
-provides="gettext-${version}_${revision}"
-build_style=gnu-configure
-configure_args="--disable-java --disable-native-java --disable-csharp
- --disable-libasprintf --enable-threads=posix --disable-rpath
- --disable-acl --with-included-glib --with-included-libcroco --without-git
- --with-included-libxml --without-emacs --disable-shared --disable-nls
- --disable-openmp --disable-curses gl_cv_func_gettimeofday_clobber=no"
-homepage="http://www.gnu.org/software/gettext/"
-license="GPL-3"
-short_desc="Internationalized Message Handling tools -- for xbps-src use"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz"
-checksum=8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/lib ${DESTDIR}/usr/include
-}
diff --git a/srcpkgs/gettext-devel-examples b/srcpkgs/gettext-devel-examples
new file mode 120000
index 00000000000..d3a6700489c
--- /dev/null
+++ b/srcpkgs/gettext-devel-examples
@@ -0,0 +1 @@
+gettext
\ No newline at end of file
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index be32fb7a7d1..95c337a7564 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,13 +1,16 @@
 # Template file for 'gettext'
 pkgname=gettext
 version=0.19.4
-revision=4
+revision=5
+bootstrap=yes
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
  --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
- --disable-openmp --with-included-libxml --with-included-libcroco"
-makedepends="ncurses-devel acl-devel"
-conflicts="chroot-gettext>=0"
+ --disable-openmp --with-included-libxml --with-included-libcroco
+ --disable-acl --with-included-glib --with-included-libcroco --without-git
+ --with-included-libxml --disable-nls --disable-openmp --disable-curses
+ --without-examples gl_cv_func_gettimeofday_clobber=no"
+replaces="chroot-gettext>=0"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/gettext/"
@@ -22,13 +25,19 @@ if [ "$CROSS_BUILD" ]; then
 	}
 fi
 
+gettext-devel-examples_package() {
+	noarch=yes
+	short_desc+=" - examples for development"
+	pkg_install() {
+		vmove usr/share/doc/gettext
+	}
+}
 gettext-devel_package() {
 	depends="gettext-libs>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
-		vmove usr/share/doc/gettext
 		vmove usr/share/aclocal
 		vmove usr/share/gettext
 	}