diff --git a/readline.changes b/readline.changes
index 97328a7..38e77d3 100644
--- a/readline.changes
+++ b/readline.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 18 22:18:49 UTC 2018 - jengelh@inai.de
+
+- Update descriptions. Replace old $RPM_* vars with macros.
+
 -------------------------------------------------------------------
 Fri Mar 16 18:05:29 UTC 2018 - werner@suse.de
 
diff --git a/readline.spec b/readline.spec
index 1851e09..30e192e 100644
--- a/readline.spec
+++ b/readline.spec
@@ -31,7 +31,7 @@ Version:        7.0
 Release:        0
 Summary:        The readline library
 License:        GPL-3.0-or-later
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://www.gnu.org/software/readline/
 # Git:          http://git.savannah.gnu.org/cgit/bash.git
 Source0:        ftp://ftp.gnu.org/gnu/readline/readline-%{version}%{rextend}.tar.gz
@@ -66,31 +66,28 @@ standard command interpreter) for easy editing of command lines.  This
 includes history and search functionality.
 
 %package devel
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        Development files for readline
 Group:          Development/Libraries/C and C++
 Requires:       libreadline7 = %{version}
 Requires:       ncurses-devel
 Recommends:     readline-doc = %{version}
 
 %description devel
-This package contains all necessary include files and libraries needed
-to develop applications that require these.
+This package contains the header files for the readline library.
 
 %package devel-static
-Summary:        Static library for Development
+Summary:        Static library for development with readline
 Group:          Development/Libraries/C and C++
 Requires:       ncurses-devel
 Requires:       readline-devel = %{version}
 Recommends:     readline-doc = %{version}
-#
 
 %description devel-static
-This package contains the static library needed
-to develop applications that require these.
+This package contains the static library for the readline library.
 
 %package doc
 Summary:        Documentation how to Use and Program with the Readline Library
-Group:          System/Libraries
+Group:          Documentation/Other
 Provides:       readline:%{_infodir}/readline.info.gz
 PreReq:         %install_info_prereq
 BuildArch:      noarch
@@ -174,7 +171,7 @@ LARGEFILE="$(getconf LFS_CFLAGS)"
 	    rl_signal_event_hook;
 	};
 	EOF
-CFLAGS="$RPM_OPT_FLAGS $LARGEFILE -D_GNU_SOURCE -Wall -g"
+CFLAGS="%{optflags} $LARGEFILE -D_GNU_SOURCE -Wall -g"
 LDFLAGS=""
 cflags -Wuninitialized         CFLAGS
 cflags -Wextra                 CFLAGS