diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 74720d9..7d39a1d 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -155,9 +155,9 @@
 
   " Since p_bdelay is of type long currently, the upper bound can be
   " impractically huge and machine-dependent.  Practically, it's sufficient
-  " to check if balloondelay works with 0xffffffff (32 bits) for now.
-  set balloondelay=4294967295
-  call assert_equal(4294967295, &balloondelay)
+  " to check if balloondelay works with 0x7fffffff (32 bits) for now.
+  set balloondelay=2147483647
+  call assert_equal(2147483647, &balloondelay)
 
   let &balloondelay = balloondelay_saved
 endfunc
diff --git a/src/version.c b/src/version.c
index 2e52f84..dbb7df2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    415,
+/**/
     414,
 /**/
     413,