diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index a9fa667b93..749f206f25 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libgpg-error"
-PKG_VERSION="1.12"
+PKG_VERSION="1.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -34,6 +34,30 @@ PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC --enable-static --disable-shared --disable-nls --disable-rpath --with-gnu-ld"
 
+pre_configure_target() {
+# inspired by openembedded
+  case ${TARGET_ARCH} in
+    aarch64)
+      GPGERROR_TUPLE=aarch64-unknown-linux-gnu
+      GPGERROR_TARGET=linux-gnueabi
+      ;;
+    arm)
+      GPGERROR_TUPLE=arm-unknown-linux-gnueabi
+      GPGERROR_TARGET=linux-gnueabi
+      ;;
+    i386)
+      GPGERROR_TUPLE=i486-pc-linux-gnu
+      GPGERROR_TARGET=linux-gnu
+      ;;
+    x86_64)
+      GPGERROR_TUPLE=x86_64-pc-linux-gnu
+      GPGERROR_TARGET=linux-gnu
+      ;;
+  esac
+
+  cp $ROOT/$PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TUPLE.h $ROOT/$PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TARGET.h
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share
diff --git a/packages/security/libgpg-error/patches/libgpg-error-1.10-gettext-0.18.patch b/packages/security/libgpg-error/patches/libgpg-error-1.10-gettext-0.18.patch
deleted file mode 100644
index 4c89e5eee7..0000000000
--- a/packages/security/libgpg-error/patches/libgpg-error-1.10-gettext-0.18.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libgpg-error-1.10/configure.ac libgpg-error-1.10.patch/configure.ac
---- libgpg-error-1.10/configure.ac	2010-10-26 11:13:48.000000000 +0200
-+++ libgpg-error-1.10.patch/configure.ac	2012-04-11 10:19:39.115582454 +0200
-@@ -112,7 +112,7 @@
- 
- 
- # Note, that autogen.sh greps for the next line.
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18])
- AM_GNU_GETTEXT([external])
- 
- # Checks for header files.