diff --git a/src/testdir/test_interrupt.vim b/src/testdir/test_interrupt.vim
index 21ff097..aa7f634 100644
--- a/src/testdir/test_interrupt.vim
+++ b/src/testdir/test_interrupt.vim
@@ -13,17 +13,20 @@
 endfunction
 
 func Test_interrupt()
-  new Xfile
+  new Xinterrupt
   let n = 0
   try
-    au BufWritePre Xfile call s:bufwritepre()
-    au BufWritePost Xfile call s:bufwritepost()
+    au BufWritePre Xinterrupt call s:bufwritepre()
+    au BufWritePost Xinterrupt call s:bufwritepost()
     w!
   catch /^Vim:Interrupt$/
   endtry
   call assert_equal(1, s:bufwritepre_called)
   call assert_equal(0, s:bufwritepost_called)
-  call assert_equal(0, filereadable('Xfile'))
+  call assert_equal(0, filereadable('Xinterrupt'))
+
+  au! BufWritePre
+  au! BufWritePost
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index df9d576..89e1fa1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5121,
+/**/
     5120,
 /**/
     5119,