diff --git a/ChangeLog b/ChangeLog
index 143f6841f..0f08b3ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
      o) sort SEE ALSO;
 
      aaron@ ok
+   - provos@cvs.openbsd.org 2001/06/22 21:27:08
+     [dh.c pathnames.h]
+     use /etc/moduli instead of /etc/primes, okay markus@
 
 20010622
  - (stevesk) handle systems without pw_expire and pw_change.
@@ -5697,4 +5700,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1299 2001/06/25 04:10:54 mouring Exp $
+$Id: ChangeLog,v 1.1300 2001/06/25 04:13:25 mouring Exp $
diff --git a/dh.c b/dh.c
index 575522ddb..26deb9fbf 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.14 2001/04/15 08:43:45 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.15 2001/06/22 21:27:07 provos Exp $");
 
 #include "xmalloc.h"
 
@@ -108,9 +108,9 @@ choose_dh(int min, int wantbits, int max)
 	int linenum;
 	struct dhgroup dhg;
 
-	f = fopen(_PATH_DH_PRIMES, "r");
-	if (!f) {
-		log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES);
+	if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&
+	    (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {
+		log("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);
 		return (dh_new_group1());
 	}
 
diff --git a/pathnames.h b/pathnames.h
index 190989655..991fc734a 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pathnames.h,v 1.6 2001/06/08 15:25:40 markus Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.7 2001/06/22 21:27:08 provos Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,6 +36,8 @@
 #define _PATH_HOST_KEY_FILE		ETCDIR "/ssh_host_key"
 #define _PATH_HOST_DSA_KEY_FILE		ETCDIR "/ssh_host_dsa_key"
 #define _PATH_HOST_RSA_KEY_FILE		ETCDIR "/ssh_host_rsa_key"
+#define _PATH_DH_MODULI			ETCDIR "/moduli"
+/* Backwards compatibility */
 #define _PATH_DH_PRIMES			ETCDIR "/primes"
 
 #ifndef _PATH_SSH_PROGRAM