diff --git a/wdiff.spec b/wdiff.spec
index 7323d82..0d78488 100644
--- a/wdiff.spec
+++ b/wdiff.spec
@@ -28,12 +28,21 @@ terminals and pagers (notably with `less').  `wdiff' is particularly
 useful when two texts differ only by a few words and paragraphs have
 been refilled.
 
+
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%setup -q -n %{name}-%{version}
-iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \
-touch -r ChangeLog ChangeLog.new && \
-mv ChangeLog.new ChangeLog
+%setup -q
+
+# Fix ISO-8859-1-encoded files
+tmp="$(mktemp)"
+for fn in ChangeLog
+do
+  iconv --from=ISO-8859-1 --to=UTF-8 "${fn}" > "${tmp}"
+  touch -r "${fn}" "${tmp}"
+  cp -p "${tmp}" "${fn}"
+done
+rm "${tmp}"
+
 
 %build
 %configure --enable-experimental="mdiff wdiff2 unify" 
@@ -42,13 +51,19 @@ mv ChangeLog.new ChangeLog
 
 %install
 %make_install
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-find $RPM_BUILD_ROOT -type f -name '*gnulib.mo' -exec rm -f {} ';'
+rm '%{buildroot}%{_infodir}/dir'
+find '%{buildroot}' -type f -name '*gnulib.mo' -print -delete
 
 %find_lang %{name}
 
+
 %files -f %{name}.lang
-%doc NEWS  README TODO  ChangeLog  AUTHORS
+%doc AUTHORS
+%doc ChangeLog
+%doc NEWS
+%doc README
+%doc TODO
+
 %{_bindir}/*
 %{_mandir}/man1/*.1.gz
 %{_infodir}/%{name}.info.*
@@ -59,6 +74,7 @@ find $RPM_BUILD_ROOT -type f -name '*gnulib.mo' -exec rm -f {} ';'
 - Change URLs from HTTP to HTTPS
 - Add source file signature verification
 - Use %%make_build and %%make_install macros
+- Reformatting and minor changes for personal style preference
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild