diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index e10025b72..9c0a789a7 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-25  David Shaw  <dshaw@jabberwocky.com>
+
+	* config.links: Re-disable assembler on Darwin.  Darwin 6.5 broke
+	it again.
+
 2003-04-15  Werner Koch  <wk@gnupg.org>
 
 	* longlong.h (umul_ppmm): Support SH3 and SH4.  Thanks to
diff --git a/mpi/config.links b/mpi/config.links
index 310e3625c..53ffcec8e 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -1,5 +1,5 @@
 # config.links - helper for ../configure
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -31,11 +31,10 @@ echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h
 
 if test "$try_asm_modules" = "yes" ; then
 case "${target}" in
-    powerpc-apple-darwin6.1)
+    powerpc-apple-darwin*)
 	echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
 	path=""
 	;;
-
     i[3467]86*-*-freebsd*-elf  | \
     i[3467]86*-*-freebsd[3-9]* | \
     i[3467]86*-*-freebsdelf*   | \
@@ -222,8 +221,8 @@ case "${target}" in
 	path="powerpc32"
 	;;
 
-    powerpc*-*-netbsd* | powerpc*-*-openbsd* | powerpc*-*-darwin*)
-       echo '/* configured for OpenBSD/NetBSD/Darwin on powerpc */' >>./mpi/asm-syntax.h
+    powerpc*-*-netbsd* | powerpc*-*-openbsd*)
+       echo '/* configured for {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
        echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
        cat   $srcdir/mpi/powerpc32/syntax.h	 >>./mpi/asm-syntax.h
        mpi_sflags="-Wa,-mppc"