2 files changed, 3 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c7e3d118e..84b34303223 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,7 @@
 
 2009-08-22  Glenn Morris  <rgm@gnu.org>
 
+        * files.el (auto-mode-alist):
         * hippie-exp.el (he-concat-directory-file-name):
         * lpr.el (lpr-windows-system, printer-name):
         * ls-lisp.el (ls-lisp-emulation, ls-lisp-use-insert-directory-program):
@@ -17,7 +18,7 @@
         * international/mule-cmds.el (set-language-environment-coding-systems):
         * net/ange-ftp.el (ange-ftp-write-region):
         * obsolete/fast-lock.el (fast-lock-cache-name):
-        Remove code for defunct system-types emx, macos, mswindows,
+        Remove code for defunct system-types emx, macos, mswindows, next-mach,
         unisoft-unix, vax-vms, win32, w32.
 
         * calendar/diary-lib.el (diary-mark-entries-1): Only mark all days of a
diff --git a/lisp/files.el b/lisp/files.el
index 825ff250449..5c1927546d7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2157,7 +2157,7 @@ since only a single case-insensitive search through the alist is made."
      ("Imakefile\\'" . makefile-imake-mode)
      ("Makeppfile\\(?:\\.mk\\)?\\'" . makefile-makepp-mode) ; Put this before .mk
      ("\\.makepp\\'" . makefile-makepp-mode)
-     ,@(if (memq system-type '(berkeley-unix next-mach darwin))
+     ,@(if (memq system-type '(berkeley-unix darwin))
            '(("\\.mk\\'" . makefile-bsdmake-mode)
              ("GNUmakefile\\'" . makefile-gmake-mode)
              ("[Mm]akefile\\'" . makefile-bsdmake-mode))