diff --git a/ChangeLog b/ChangeLog
index 9cb4f838c..4f815ae41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010916
+ - (djm) Workaround XFree breakage in RPM spec file
+
 20010915
  - (djm) Make do_pre_login static to avoid prototype #ifdef hell
  - (djm) Sync scard/ stuff
@@ -6441,4 +6444,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1520 2001/09/16 07:13:11 djm Exp $
+$Id: ChangeLog,v 1.1521 2001/09/16 07:13:45 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 20e9bf4da..f67174fc1 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -153,7 +153,11 @@ make
 
 %if ! %{no_x11_askpass}
 pushd x11-ssh-askpass-%{aversion}
-xmkmf -a
+xmkmf
+### Hacks to workaround XFree breakage
+perl -pi -e "s|distclean: |distclean:: |g" Makefile
+make SshAskpass_ad.h
+###
 make
 popd
 %endif