diff --git a/templates/libgpg-error-devel b/templates/libgpg-error-devel
new file mode 120000
index 00000000000..1180ed7ec2e
--- /dev/null
+++ b/templates/libgpg-error-devel
@@ -0,0 +1 @@
+libgpg-error
\ No newline at end of file
diff --git a/templates/libgpg-error/depends b/templates/libgpg-error/depends
new file mode 100644
index 00000000000..b8bebe468c0
--- /dev/null
+++ b/templates/libgpg-error/depends
@@ -0,0 +1,2 @@
+abi_depends=1.6
+api_depends=${abi_depends}
diff --git a/templates/libgpg-error/devel.template b/templates/libgpg-error/devel.template
new file mode 100644
index 00000000000..26d81695291
--- /dev/null
+++ b/templates/libgpg-error/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'libgpg-error-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libgpg-error
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/bin
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share
+
+	mv ${SRCPKGDESTDIR}/usr/bin/gpg-error-config ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+}
diff --git a/templates/libgpg-error/template b/templates/libgpg-error/template
index 19483466ab8..a0673393050 100644
--- a/templates/libgpg-error/template
+++ b/templates/libgpg-error/template
@@ -1,14 +1,21 @@
 # Template build file for 'libgpg-error'.
 pkgname=libgpg-error
+sourcepkg=$pkgname
 version=1.6
-distfiles="
-ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2"
+distfiles="ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-short_desc="Definitions of common error values for all GnuPG components"
+short_desc="Library for error values used by GnuPG component"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=5015a9e0a9c59fe5e9a45d203c324af3736c5d68
+checksum=aa7df632134dfd3d4e65f5a98edd6bb9a97b498db911f4287bbaeb5ae83a1bad
 long_desc="
  libgpg-error is a library that defines common error values for all
- GnuPG components.  Among these are GPG, GPGSM, GPGME, GPG-Agent,
+ GnuPG components. Among these are GPG, GPGSM, GPGME, GPG-Agent,
  libgcrypt, pinentry, SmartCard Daemon and possibly more in the future."
+
+subpackages="devel"
+Add_dependency full glibc
+
+post_install()
+{
+	rm -rf ${DESTDIR}/usr/share/common-lisp
+}