4 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e3e13ebab..dc11e625e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
  - (djm) Remove redundant and incorrect test for max auth attempts in 
    PAM kbdint code. Based on fix from Matthew Melvin 
   <matthewm@webcentral.com.au>
+ - (djm) Rename sysconfdir/primes => sysconfdir/moduli
 
 20010625
  - OpenBSD CVS Sync
@@ -5797,4 +5798,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1327 2001/06/27 05:36:43 djm Exp $
+$Id: ChangeLog,v 1.1328 2001/06/27 07:07:16 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 09c42a093..dd9a3e253 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -251,7 +251,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 
 %files clients
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 4075d4f82..1327ca854 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -171,7 +171,7 @@ fi
 %attr(0755,root,root) %dir /etc/ssh
 %attr(0644,root,root) %config /etc/ssh/ssh_config
 %attr(0600,root,root) %config /etc/ssh/sshd_config
-%attr(0600,root,root) %config /etc/ssh/primes
+%attr(0600,root,root) %config /etc/ssh/moduli
 %attr(0644,root,root) %config /etc/pam.d/sshd
 %attr(0755,root,root) %config /sbin/init.d/sshd
 %attr(0755,root,root) /usr/bin/ssh-keygen
diff --git a/primes b/moduli
index 5a3daba1c..5a3daba1c 100644
--- a/primes
+++ b/moduli