diff --git a/7.1.012 b/7.1.012
new file mode 100644
index 0000000..97ce904
--- /dev/null
+++ b/7.1.012
@@ -0,0 +1,62 @@
+To: vim-dev@vim.org
+Subject: patch 7.1.012
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.012
+Problem:    ":let &shiftwidth = 'asdf'" doesn't produce an error message.
+Solution:   Check for a string argument. (Chris Lubinski)
+Files:	    src/option.c
+
+
+*** ../vim-7.1.011/src/option.c	Sun May  6 15:37:32 2007
+--- src/option.c	Tue Jun 19 20:56:36 2007
+***************
+*** 8219,8224 ****
+--- 8219,8243 ----
+  	    varp = get_varp(&options[opt_idx]);
+  	    if (varp != NULL)	/* hidden option is not changed */
+  	    {
++ 		if (number == 0 && string != NULL)
++ 		{
++ 		    int index;
++ 
++ 		    /* Either we are given a string or we are setting option
++ 		     * to zero. */
++ 		    for (index = 0; string[index] == '0'; ++index)
++ 			;
++ 		    if (string[index] != NUL || index == 0)
++ 		    {
++ 			/* There's another character after zeros or the string
++ 			 * is empty.  In both cases, we are trying to set a
++ 			 * num option using a string. */
++ 			EMSG3(_("E521: Number required: &%s = '%s'"),
++ 								name, string);
++ 			return;     /* do nothing as we hit an error */
++ 
++ 		    }
++ 		}
+  		if (flags & P_NUM)
+  		    (void)set_num_option(opt_idx, varp, number,
+  							  NULL, 0, opt_flags);
+*** ../vim-7.1.011/src/version.c	Tue Jun 19 20:30:46 2007
+--- src/version.c	Tue Jun 19 20:53:15 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     12,
+  /**/
+
+-- 
+Ten million Linux users can't be wrong!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/README.patches b/README.patches
index c5cd9a1..ef194ee 100644
--- a/README.patches
+++ b/README.patches
@@ -27,3 +27,13 @@ Individual patches for Vim 7.1:
   SIZE  NAME     FIXES
   2404  7.1.001  can't build with Gnome GUI
   2011  7.1.002  Oracle Pro*C/C++ files are not detected
+  1529  7.1.003  (extra) Win32: menu entries end up in message history
+  2481  7.1.004  crash when editing a directory
+  3841  7.1.005  "cit" used on <foo></foo> deletes <foo>
+  2941  7.1.006  when reading from stdin 'modified' can't be reset in autocmd
+  6458  7.1.007  (extra) Mac: context menu does not work, scrollbars not dimmed
+  2631  7.1.008  getfsize() returns an invalid number for very big files
+  1881  7.1.009  diff mode: tab to spaces change not highlighted correctly
+  2796  7.1.010  Gnome: tab pages are not included in the saved session
+  1934  7.1.011  buffer overflow when $VIMRUNTIME is very long
+  1904  7.1.012  ":let &tw = 'asdf'" does not give an error message
diff --git a/vim.spec b/vim.spec
index 061e86a..efa2275 100644
--- a/vim.spec
+++ b/vim.spec
@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 2
+%define patchlevel 12
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -53,6 +53,16 @@ BuildRequires: hunspell-devel
 # for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.%03d\n" $i $i; done
 Patch001: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.001
 Patch002: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.002
+# Win32: Patch003: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.003
+Patch004: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.004
+Patch005: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.006
+#Mac: Patch007: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.007
+Patch008: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.008
+Patch009: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.009
+Patch010: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.010
+Patch011: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.011
+Patch012: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.012
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -187,6 +197,16 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 # for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
 %patch001 -p0
 %patch002 -p0
+#Win 32: patch003 -p0
+%patch004 -p0
+%patch005 -p0
+%patch006 -p0
+#Mac: patch007 -p0
+%patch008 -p0
+%patch009 -p0
+%patch010 -p0
+%patch011 -p0
+%patch012 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -572,7 +592,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Mon Jun 04 2007 Karsten Hopp <karsten@redhat.com> 7.1.%{nil}2-1
+* Wed Jun 27 2007 Karsten Hopp <karsten@redhat.com> 7.1.12-1
+- Patchlevel 12
+
+* Mon Jun 04 2007 Karsten Hopp <karsten@redhat.com> 7.1.2-1
 - vim 7.1
 - drop 240 patches