diff --git a/python-libmount.changes b/python-libmount.changes
index 9213653..ffbce76 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
+
+- Change condition for known fail markers from test for armv6 and aarch64
+  architecture to test for qemu user-space build
+
 -------------------------------------------------------------------
 Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
 
diff --git a/python-libmount.spec b/python-libmount.spec
index a7923ba..cc9713c 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -76,7 +76,7 @@ Name:           python-libmount
 %endif
 Summary:        %main_summary
 License:        GPL-2.0+
-Group:          %main_group
+Group:          %group_pl
 BuildRequires:  audit-devel
 BuildRequires:  bc
 BuildRequires:  binutils-devel
@@ -388,6 +388,7 @@ SMP systems.
 %if %build_util_linux
 %package -n python-libmount
 Summary:        %summary_pl
+License:        GPL-2.0+
 Group:          %group_pl
 
 %description -n python-libmount
@@ -609,7 +610,7 @@ make %{?_smp_mflags}
 # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
 export TS_OPT_misc_setarch_known_fail="yes"
 #
-%ifarch armv6l armv6hl aarch64
+%if 0%{?qemu_user_space_build}
 export TS_OPT_fdisk_gpt_known_fail="yes"
 export TS_OPT_fdisk_oddinput_known_fail="yes"
 export TS_OPT_fdisk_sunlabel_known_fail="yes"
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 9213653..ffbce76 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
+
+- Change condition for known fail markers from test for armv6 and aarch64
+  architecture to test for qemu user-space build
+
 -------------------------------------------------------------------
 Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index b5a1a13..a9d1af7 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -609,7 +609,7 @@ make %{?_smp_mflags}
 # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
 export TS_OPT_misc_setarch_known_fail="yes"
 #
-%ifarch armv6l armv6hl aarch64
+%if 0%{?qemu_user_space_build}
 export TS_OPT_fdisk_gpt_known_fail="yes"
 export TS_OPT_fdisk_oddinput_known_fail="yes"
 export TS_OPT_fdisk_sunlabel_known_fail="yes"
diff --git a/util-linux.changes b/util-linux.changes
index 9213653..ffbce76 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
+
+- Change condition for known fail markers from test for armv6 and aarch64
+  architecture to test for qemu user-space build
+
 -------------------------------------------------------------------
 Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index ff19d05..044a681 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -609,7 +609,7 @@ make %{?_smp_mflags}
 # glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
 export TS_OPT_misc_setarch_known_fail="yes"
 #
-%ifarch armv6l armv6hl aarch64
+%if 0%{?qemu_user_space_build}
 export TS_OPT_fdisk_gpt_known_fail="yes"
 export TS_OPT_fdisk_oddinput_known_fail="yes"
 export TS_OPT_fdisk_sunlabel_known_fail="yes"