diff --git a/psgml.changes b/psgml.changes
index 49f573d..d2b13aa 100644
--- a/psgml.changes
+++ b/psgml.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 23 13:20:56 UTC 2018 - ke@suse.com
+
+- In comments, escape macros.
+- Stop compiling tdtd-font-maker.el (do not needed at run-time).
+
+-------------------------------------------------------------------
+Tue Jul 17 10:54:23 UTC 2018 - ke@suse.com
+
+- Run emacs with -Q (instead of --no-site).
+
 -------------------------------------------------------------------
 Mon Feb 19 12:53:44 UTC 2018 - ke@suse.com
 
diff --git a/psgml.spec b/psgml.spec
index b3ecac5..45c6f59 100644
--- a/psgml.spec
+++ b/psgml.spec
@@ -105,14 +105,14 @@ cp -p %{S:9} .
 ./configure --prefix=%{_prefix} --infodir=%{_infodir}
 make # emacs
 echo "(add-to-list (quote load-path) (getenv \"PWD\"))" > load-psgml.el
-emacs --batch --no-site -l load-psgml.el \
+emacs --batch -Q -l load-psgml.el \
       -l ./tdtd-font.el \
-      -f batch-byte-compile tdtd-font.el tdtd-font-maker.el tdtd.el
-emacs --batch --no-site -l load-psgml.el -f batch-byte-compile xxml.el
-emacs --batch --no-site -l load-psgml.el -l ./xxml.el \
+      -f batch-byte-compile tdtd-font.el tdtd.el
+emacs --batch -Q -l load-psgml.el -f batch-byte-compile xxml.el
+emacs --batch -Q -l load-psgml.el -l ./xxml.el \
       -f batch-byte-compile ke-docbook.el
-emacs --batch --no-site -l load-psgml.el -f batch-byte-compile psgml-xpointer.el
-emacs --batch --no-site -l load-psgml.el -l tempo -f batch-byte-compile psgml-html.el
+emacs --batch -Q -l load-psgml.el -f batch-byte-compile psgml-xpointer.el
+emacs --batch -Q -l load-psgml.el -l tempo -f batch-byte-compile psgml-html.el
 makeinfo psgml.texi
 makeinfo psgml-api.texi
 
@@ -130,11 +130,11 @@ make install-info prefix="$RPM_BUILD_ROOT%{_prefix}" \
                   lispdir="$RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml" \
                   infodir="$RPM_BUILD_ROOT%{_infodir}"
 #install -p -m644 suse-start-psgml.el \
-#    $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
+#    $RPM_BUILD_ROOT%%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
 install -p -m644 iso88591.map \
     $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml/iso88591.map
 install -p -m644 tdtd-font.el tdtd-font.elc \
-                 tdtd-font-maker.el tdtd-font-maker.elc \
+                 tdtd-font-maker.el \
                  tdtd.el tdtd.elc \
                  $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml/
 install -p -m644 xxml.el xxml.elc \
@@ -168,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc suse-start-psgml.el
 %doc psgml-jade
 %doc tdtd-readme.txt tdtd-tutorial.txt tdtd.dot.emacs
-# %config %{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
+# %config %%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
 %{_prefix}/share/emacs/site-lisp/psgml
 %doc %{_infodir}/psgml-api.info*
 %doc %{_infodir}/psgml.info*