diff --git a/python-libmount.spec b/python-libmount.spec
index 725826e..5070e3f 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -73,7 +73,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
@@ -403,6 +403,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
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index ebafa17..124140e 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de
+
+- Ensure libreadline usage as well as _GNU_SOURCE
+
 -------------------------------------------------------------------
 Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 79de592..aa28d15 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -542,6 +542,8 @@ fi
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie"
 export LDFLAGS="-Wl,-z,relro,-z,now"
+export CFLAGS="%{optflags} -D_GNU_SOURCE"
+export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
 # override default localstatedir to /run
 # only used for volatile data
 #
@@ -553,8 +555,10 @@ AUTOPOINT=true autoreconf -vfi
   --localstatedir=/run \
   --docdir=%{_docdir}/%{_name} \
   --with-audit \
+  --with-btrfs \
   --with-gnu-ld \
   --with-ncursesw \
+  --with-readline \
   --with-selinux \
   $uhead \
   --with-bashcompletiondir=%{_datadir}/bash-completion/completions \
diff --git a/util-linux.changes b/util-linux.changes
index ebafa17..124140e 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de
+
+- Ensure libreadline usage as well as _GNU_SOURCE
+
 -------------------------------------------------------------------
 Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index d5c3687..03ab85d 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -542,6 +542,8 @@ fi
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie"
 export LDFLAGS="-Wl,-z,relro,-z,now"
+export CFLAGS="%{optflags} -D_GNU_SOURCE"
+export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
 # override default localstatedir to /run
 # only used for volatile data
 #
@@ -553,8 +555,10 @@ AUTOPOINT=true autoreconf -vfi
   --localstatedir=/run \
   --docdir=%{_docdir}/%{_name} \
   --with-audit \
+  --with-btrfs \
   --with-gnu-ld \
   --with-ncursesw \
+  --with-readline \
   --with-selinux \
   $uhead \
   --with-bashcompletiondir=%{_datadir}/bash-completion/completions \