diff --git a/xz.changes b/xz.changes
index 170457e..4cc57ce 100644
--- a/xz.changes
+++ b/xz.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 10 10:50:01 UTC 2017 - jengelh@inai.de
+
+- % needs to be encoded in description; adjust weird indent there
+  as well. Expand LZMA in summaries.
+
+-------------------------------------------------------------------
+Fri Jun 30 18:25:33 UTC 2017 - olaf@aepfle.de
+
+- Really use the selfdefined CFLAGS during build to fix build
+
 -------------------------------------------------------------------
 Sun Jun 25 11:37:03 UTC 2017 - astieger@suse.com
 
diff --git a/xz.spec b/xz.spec
index b07232b..93d147a 100644
--- a/xz.spec
+++ b/xz.spec
@@ -21,7 +21,7 @@
 Name:           xz
 Version:        5.2.3
 Release:        0
-Summary:        A Program for Compressing Files
+Summary:        A Program for Compressing Files with the Lempel–Ziv–Markov algorithm
 License:        LGPL-2.1+ AND GPL-2.0+
 Group:          Productivity/Archiving/Compression
 Url:            http://tukaani.org/xz/
@@ -41,22 +41,22 @@ Recommends:     %{name}-lang
 %endif
 
 %description
-The xz command is a very powerful program for compressing files.
-* Average compression ratio of LZMA is about 30% better than that of
-   gzip, and 15% better than that of bzip2.
+The xz command is a program for compressing files.
+* Average compression ratio of LZMA is about 30%% better than that of
+  gzip, and 15%% better than that of bzip2.
 * Decompression speed is only little slower than that of gzip, being
-   two to five times faster than bzip2.
+  two to five times faster than bzip2.
 * In fast mode, compresses faster than bzip2 with a comparable
-   compression ratio.
+  compression ratio.
 * Achieving the best compression ratios takes four to even twelve
-   times longer than with bzip2. However. this doesn't affect
-   decompressing speed.
+  times longer than with bzip2. However, this does not affect
+  decompressing speed.
 * Very similar command line interface to what gzip and bzip2 have.
 
 %lang_package
 
 %package -n liblzma5
-Summary:        LZMA library
+Summary:        Lempel–Ziv–Markov chain algorithm compression library
 Group:          System/Libraries
 
 %description -n liblzma5
@@ -93,10 +93,10 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie"
   --with-pic \
   --docdir=%{_docdir}/%{name}
 %if 0%{?do_profiling}
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
+  make %{?_smp_mflags} CFLAGS="${CFLAGS} %{cflags_profile_generate}"
   make check %{?_smp_mflags}
   make clean
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
+  make %{?_smp_mflags} CFLAGS="${CFLAGS} %{cflags_profile_feedback}"
 %else
   make %{?_smp_mflags}
 %endif
@@ -108,6 +108,7 @@ make %{?_smp_mflags} check
 %if 0%{?make_install:1}
 %make_install
 %else
+# Retain this line, with trailing #, to work around an overly eager spec-cleaner
 make DESTDIR=%{buildroot} install %{?_smp_mflags} #
 %endif
 find %{buildroot} -type f -name "*.la" -delete -print