diff --git a/security/libgcrypt/disable-tests.patch.cross b/security/libgcrypt/disable-tests.patch.cross
deleted file mode 100644
index ec4164a34..000000000
--- a/security/libgcrypt/disable-tests.patch.cross
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../libgcrypt/disable-tests.patch.cross
-# Copyright (C) 2008 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- libgcrypt-1.4.0/Makefile.in.orig	2007-12-10 11:05:13.000000000 +0200
-+++ libgcrypt-1.4.0/Makefile.in	2008-03-15 19:27:24.000000000 +0200
-@@ -236,8 +236,8 @@
- DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
-   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
- 
--DIST_SUBDIRS = m4 mpi cipher src doc tests
--SUBDIRS = mpi cipher src doc tests
-+DIST_SUBDIRS = m4 mpi cipher src doc
-+SUBDIRS = mpi cipher src doc
- EXTRA_DIST = BUGS autogen.sh README.SVN
- DISTCLEANFILES = 
- all: config.h
diff --git a/security/libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross b/security/libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross
new file mode 100644
index 000000000..b84ab624c
--- /dev/null
+++ b/security/libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross
@@ -0,0 +1,31 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross
+# Copyright (C) 2008 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Author: Nicolas Thill
+Origin: OpenWRT (https://dev.openwrt.org/browser/packages/libs/libgcrypt/)
+Description: Fix libgcrypt tests to build while cross-compiling.
+
+--- libgcrypt-1.4.0/tests/Makefile.in.orig	2008-03-17 02:40:20.000000000 +0200
++++ libgcrypt-1.4.0/tests/Makefile.in	2008-03-17 02:40:41.000000000 +0200
+@@ -313,7 +313,7 @@
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+-LDADD = ../src/libgcrypt.la
++LDADD = ../src/libgcrypt.la @LTLIBOBJS@ @GPG_ERROR_LIBS@
+ 
+ # pkbench uses mmap for no good reason.  Needs to be fixed.  Code for
+ # this can be found in libksba/tests. 
diff --git a/security/libgcrypt/libgcrypt.conf b/security/libgcrypt/libgcrypt.conf
index 588d6d71c..1eada6109 100644
--- a/security/libgcrypt/libgcrypt.conf
+++ b/security/libgcrypt/libgcrypt.conf
@@ -16,3 +16,8 @@
 # one from the sandbox while cross-compiling
 pkgprefix -t libgpg-error
 var_append confopt ' ' "--with-gpg-error-prefix=$root/$( pkgprefix libgpg-error )"
+
+# explicitely disable MPI assembler modules while cross-compiling
+if atstage cross; then
+	var_append extraconfopt ' ' "--disable-asm"
+fi