diff --git a/Changes b/Changes
index 19758d0..fcf55ef 100644
--- a/Changes
+++ b/Changes
@@ -42,6 +42,8 @@ Release ...
 * The 'substitute' ex command can now be abbreviated as 'sub', 'subst' etc.
 * A new version of mapmalloc.c that is derived from Unix 7th Edition code
   has been introduced.
+* If the 'next!' ex command is given and the autowrite option is set, the
+  current file is not written anymore.
 
 Release 1/19/05
 * The last release erroneously made 'X' work like 'x' in visual mode. It now
diff --git a/ex_cmds.c b/ex_cmds.c
index 8fd78ed..c23a1e2 100644
--- a/ex_cmds.c
+++ b/ex_cmds.c
@@ -73,7 +73,7 @@
 
 #ifndef	lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)ex_cmds.c	1.21 (gritter) 2/17/05";
+static char sccsid[] = "@(#)ex_cmds.c	1.22 (gritter) 2/18/05";
 #endif
 #endif
 
@@ -466,7 +466,8 @@ casek:
 /* next */
 			tail("next");
 			setnoaddr();
-			ckaw();
+			if (!exclam())
+				ckaw();
 			ignore(quickly());
 			if (getargs())
 				makargs();