diff --git a/libgcrypt.changes b/libgcrypt.changes
index 31f850d..11d2f19 100644
--- a/libgcrypt.changes
+++ b/libgcrypt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 23:43:40 UTC 2017 - jengelh@inai.de
+
+- RPM group fixes.
+
 -------------------------------------------------------------------
 Fri Jul 21 15:50:14 UTC 2017 - astieger@suse.com
 
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 9240925..6d5e466 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -70,7 +70,7 @@ understanding of applied cryptography is required to use Libgcrypt.
 %package -n %{libsoname}
 Summary:        The GNU Crypto Library
 License:        GPL-2.0+ AND LGPL-2.1+
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 
 %description -n %{libsoname}
 Libgcrypt is a general purpose crypto library based on the code used in
@@ -79,7 +79,7 @@ GnuPG (alpha version).
 %package -n %{libsoname}-hmac
 Summary:        HMAC checksums for the GNU Crypto Library
 License:        GPL-2.0+ AND LGPL-2.1+
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 Requires:       %{libsoname} = %{version}-%{release}
 
 %description -n %{libsoname}-hmac
@@ -160,7 +160,7 @@ autoreconf -fi
 date=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})
 sed -e "s,BUILD_TIMESTAMP=.*,BUILD_TIMESTAMP=$date," -i configure
 export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
-%configure --with-pic \
+%configure \
            --enable-noexecstack \
            --disable-static \
            --enable-m-guard \