diff --git a/src/libassuan-config.in b/src/libassuan-config.in
index 04177f0..9ee7553 100644
--- a/src/libassuan-config.in
+++ b/src/libassuan-config.in
@@ -19,7 +19,7 @@ lib="@LIBASSUAN_CONFIG_LIB@"
 extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs"
 cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags"
 api_version="@LIBASSUAN_CONFIG_API_VERSION@"
-my_host="@LIBASSUAN_CONFIG_HOST@"
+my_host="none"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includes=""
@@ -122,13 +122,7 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-    if test "@libdir@" != "/usr/lib" ; then
-      libdirs="-L@libdir@"
-      for i in $lib $extralibs ; do
-	if test "$i" = "-L@libdir@" ; then
-	  libdirs=""
-	fi
-      done
-    fi
+    # libdir is always standard and implicitly searched
+    libdirs=""
     echo $libdirs $lib $extralibs
 fi
diff --git a/src/libassuan-config.in.multilib b/src/libassuan-config.in.multilib
new file mode 100644
index 0000000..04177f0
--- /dev/null
+++ b/src/libassuan-config.in.multilib
@@ -0,0 +1,134 @@
+#!/bin/sh
+#    Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# SPDX-License-Identifier: FSFULLR
+
+# Configure libgpg-error.
+gpg_error_cflags="@GPG_ERROR_CFLAGS@"
+gpg_error_libs="@GPG_ERROR_LIBS@"
+
+PGM=libassuan-config
+lib="@LIBASSUAN_CONFIG_LIB@"
+extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs"
+cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags"
+api_version="@LIBASSUAN_CONFIG_API_VERSION@"
+my_host="@LIBASSUAN_CONFIG_HOST@"
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includes=""
+libdirs=""
+exec_prefix_set=no
+echo_libs=no
+echo_cflags=no
+echo_prefix=no
+echo_exec_prefix=no
+echo_host=no
+
+
+usage()
+{
+	cat <<EOF
+Usage: $PGM [OPTIONS]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+        [--host]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+  usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      # Dummy
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      # Dummy
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      echo "@VERSION@"
+      exit 0
+      ;;
+    --api-version)
+      echo_api_version=yes
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    --host)
+      echo_host=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_api_version" = "yes"; then
+    echo $api_version
+fi
+
+if test "$echo_host" = "yes"; then
+    echo "$my_host"
+fi
+
+if test "$echo_cflags" = "yes"; then
+    if test "@includedir@" != "/usr/include" ; then
+      includes="-I@includedir@"
+      for i in $cflags ; do
+	if test "$i" = "-I@includedir@" ; then
+	  includes=""
+	fi
+      done
+    fi
+    echo $includes $cflags
+fi
+
+if test "$echo_libs" = "yes"; then
+    if test "@libdir@" != "/usr/lib" ; then
+      libdirs="-L@libdir@"
+      for i in $lib $extralibs ; do
+	if test "$i" = "-L@libdir@" ; then
+	  libdirs=""
+	fi
+      done
+    fi
+    echo $libdirs $lib $extralibs
+fi