diff --git a/libassuan.changes b/libassuan.changes
index f649242..53b4285 100644
--- a/libassuan.changes
+++ b/libassuan.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  9 11:17:23 UTC 2016 - schwab@suse.de
+
+- qemu-disable-fdpassing-test.patch: disable fdpassing test when running
+  under qemu-linux-user
+
 -------------------------------------------------------------------
 Mon Jul 18 22:16:32 UTC 2016 - astieger@suse.com
 
diff --git a/libassuan.spec b/libassuan.spec
index 424899f..42993b6 100644
--- a/libassuan.spec
+++ b/libassuan.spec
@@ -28,6 +28,7 @@ Source1:        baselibs.conf
 Source2:        ftp://ftp.gnupg.org/gcrypt/libassuan/%{name}-%{version}.tar.bz2.sig
 # http://www.gnupg.org/signature_key.en.html
 Source3:        libassuan.keyring
+Patch0:         qemu-disable-fdpassing-test.patch
 BuildRequires:  libgpg-error-devel >= 1.17
 Requires:       %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -56,6 +57,10 @@ v2 server, but it uses it's own copy of libassuan.
 
 %prep
 %setup -q
+%if 0%{?qemu_user_space_build}
+# qemu-linux-user does not yet support descriptor passing over sockets
+%patch0 -p1
+%endif
 
 %build
 # Compile with PIC, library is linked into shared libraries:
diff --git a/qemu-disable-fdpassing-test.patch b/qemu-disable-fdpassing-test.patch
new file mode 100644
index 0000000..4cb22e5
--- /dev/null
+++ b/qemu-disable-fdpassing-test.patch
@@ -0,0 +1,26 @@
+Index: libassuan-2.4.3/tests/Makefile.am
+===================================================================
+--- libassuan-2.4.3.orig/tests/Makefile.am
++++ libassuan-2.4.3/tests/Makefile.am
+@@ -34,7 +34,7 @@ w32cetools = ce-createpipe ce-server
+ endif
+ 
+ if USE_DESCRIPTOR_PASSING
+-TESTS += fdpassing
++#TESTS += fdpassing
+ endif
+ 
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+Index: libassuan-2.4.3/tests/Makefile.in
+===================================================================
+--- libassuan-2.4.3.orig/tests/Makefile.in
++++ libassuan-2.4.3/tests/Makefile.in
+@@ -116,7 +116,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-@USE_DESCRIPTOR_PASSING_TRUE@am__EXEEXT_1 = fdpassing$(EXEEXT)
++@USE_DESCRIPTOR_PASSING_TRUE@#am__EXEEXT_1 = fdpassing$(EXEEXT)
+ am__EXEEXT_2 = version$(EXEEXT) pipeconnect$(EXEEXT) $(am__EXEEXT_1)
+ @HAVE_W32CE_SYSTEM_TRUE@am__EXEEXT_3 = ce-createpipe$(EXEEXT) \
+ @HAVE_W32CE_SYSTEM_TRUE@	ce-server$(EXEEXT)