diff --git a/vim.spec b/vim.spec
index 08cb130..41577fe 100644
--- a/vim.spec
+++ b/vim.spec
@@ -56,105 +56,105 @@ BuildRequires: hunspell-devel
 # Patches 001 < 999 are patches from the base maintainer.
 # If you're as lazy as me, generate the list using
 # 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
-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
-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
-Patch013: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.013
-Patch014: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.014
-Patch015: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.015
-Patch016: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.016
-Patch017: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.017
-Patch018: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.018
-Patch019: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.019
-Patch020: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.020
-Patch021: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.021
-Patch022: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.022
-Patch023: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.023
-Patch024: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.024
-Patch025: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.025
-Patch026: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.026
-Patch027: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.027
-Patch028: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.028
-Patch029: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.029
-Patch030: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.030
-Patch031: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.031
-Patch032: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.032
-Patch033: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.033
-Patch034: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.034
-Patch035: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.035
-Patch036: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.036
-Patch037: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.037
-Patch038: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.038
-Patch039: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039
-Patch040: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.040
-Patch041: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.041
-Patch042: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.042
-Patch043: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.043
-Patch044: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.044
-Patch045: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.045
-Patch046: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.046
-Patch047: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.047
-Patch048: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.048
-Patch049: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.049
-Patch050: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.050
-Patch051: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.051
-Patch052: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.052
-Patch053: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.053
-Patch054: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.054
-Patch055: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.055
-Patch056: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.056
-Patch057: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.057
-Patch058: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.058
-Patch059: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.059
-Patch060: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.060
-Patch061: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.061
-Patch062: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.062
-Patch063: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.063
-Patch064: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.064
-Patch065: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.065
-Patch066: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.066
-Patch067: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.067
-Patch068: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.068
-Patch069: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.069
-Patch070: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.070
-Patch071: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.071
-Patch072: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.072
-Patch073: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.073
-Patch074: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.074
-Patch075: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.075
-Patch076: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.076
-Patch077: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.077
-Patch078: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.078
-Patch079: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.079
-Patch080: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.080
-Patch081: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.081
-Patch082: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.082
-Patch083: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.083
-Patch084: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.084
-Patch085: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085
-Patch086: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086
-Patch087: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087
-Patch088: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088
-Patch089: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089
-Patch090: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090
-Patch091: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091
-Patch092: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092
-Patch093: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093
-Patch094: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094
-Patch095: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095
-Patch096: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096
-Patch097: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097
-Patch098: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098
-Patch099: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
+Patch1:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.001
+Patch2:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.002
+Patch3:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.003
+Patch4:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.004
+Patch5:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.005
+Patch6:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.006
+Patch7:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.007
+Patch8:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.008
+Patch9:   ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.009
+Patch10:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.010
+Patch11:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.011
+Patch12:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.012
+Patch13:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.013
+Patch14:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.014
+Patch15:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.015
+Patch16:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.016
+Patch17:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.017
+Patch18:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.018
+Patch19:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.019
+Patch20:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.020
+Patch21:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.021
+Patch22:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.022
+Patch23:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.023
+Patch24:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.024
+Patch25:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.025
+Patch26:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.026
+Patch27:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.027
+Patch28:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.028
+Patch29:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.029
+Patch30:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.030
+Patch31:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.031
+Patch32:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.032
+Patch33:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.033
+Patch34:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.034
+Patch35:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.035
+Patch36:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.036
+Patch37:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.037
+Patch38:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.038
+Patch39:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039
+Patch40:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.040
+Patch41:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.041
+Patch42:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.042
+Patch43:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.043
+Patch44:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.044
+Patch45:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.045
+Patch46:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.046
+Patch47:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.047
+Patch48:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.048
+Patch49:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.049
+Patch50:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.050
+Patch51:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.051
+Patch52:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.052
+Patch53:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.053
+Patch54:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.054
+Patch55:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.055
+Patch56:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.056
+Patch57:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.057
+Patch58:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.058
+Patch59:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.059
+Patch60:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.060
+Patch61:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.061
+Patch62:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.062
+Patch63:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.063
+Patch64:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.064
+Patch65:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.065
+Patch66:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.066
+Patch67:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.067
+Patch68:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.068
+Patch69:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.069
+Patch70:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.070
+Patch71:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.071
+Patch72:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.072
+Patch73:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.073
+Patch74:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.074
+Patch75:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.075
+Patch76:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.076
+Patch77:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.077
+Patch78:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.078
+Patch79:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.079
+Patch80:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.080
+Patch81:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.081
+Patch82:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.082
+Patch83:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.083
+Patch84:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.084
+Patch85:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.085
+Patch86:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.086
+Patch87:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.087
+Patch88:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.088
+Patch89:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.089
+Patch90:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.090
+Patch91:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.091
+Patch92:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.092
+Patch93:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.093
+Patch94:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.094
+Patch95:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.095
+Patch96:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.096
+Patch97:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.097
+Patch98:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.098
+Patch99:  ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.099
 Patch100: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.100
 Patch101: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.101
 Patch102: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.102
@@ -523,105 +523,105 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 
 # Base patches...
 # for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
-%patch001 -p0
-%patch002 -p0
-%patch003 -p0
-%patch004 -p0
-%patch005 -p0
-%patch006 -p0
-%patch007 -p0
-%patch008 -p0
-%patch009 -p0
-%patch010 -p0
-%patch011 -p0
-%patch012 -p0
-%patch013 -p0 
-%patch014 -p0 
-%patch015 -p0 
-%patch016 -p0 
-%patch017 -p0 
-%patch018 -p0 
-%patch019 -p0 
-%patch020 -p0 
-%patch021 -p0 
-%patch022 -p0 
-%patch023 -p0 
-%patch024 -p0 
-%patch025 -p0 
-%patch026 -p0 
-%patch027 -p0 
-%patch028 -p0 
-%patch029 -p0
-%patch030 -p0
-%patch031 -p0
-%patch032 -p0
-%patch033 -p0
-%patch034 -p0
-%patch035 -p0
-%patch036 -p0
-%patch037 -p0
-%patch038 -p0
-%patch039 -p0
-%patch040 -p0
-%patch041 -p0
-%patch042 -p0
-%patch043 -p0
-%patch044 -p0
-%patch045 -p0
-%patch046 -p0
-%patch047 -p0
-%patch048 -p0
-%patch049 -p0
-%patch050 -p0
-%patch051 -p0
-%patch052 -p0
-%patch053 -p0
-%patch054 -p0
-%patch055 -p0
-%patch056 -p0
-%patch057 -p0
-%patch058 -p0
-%patch059 -p0
-%patch060 -p0
-%patch061 -p0
-%patch062 -p0
-%patch063 -p0
-%patch064 -p0
-%patch065 -p0
-%patch066 -p0
-%patch067 -p0
-%patch068 -p0
-%patch069 -p0 
-%patch070 -p0 
-%patch071 -p0 
-%patch072 -p0 
-%patch073 -p0 
-%patch074 -p0 
-%patch075 -p0 
-%patch076 -p0 
-%patch077 -p0 
-%patch078 -p0 
-%patch079 -p0 
-%patch080 -p0 
-%patch081 -p0 
-%patch082 -p0 
-%patch083 -p0 
-%patch084 -p0 
-%patch085 -p0 
-%patch086 -p0 
-%patch087 -p0 
-%patch088 -p0 
-%patch089 -p0 
-%patch090 -p0 
-%patch091 -p0 
-%patch092 -p0 
-%patch093 -p0 
-%patch094 -p0 
-%patch095 -p0 
-%patch096 -p0 
-%patch097 -p0 
-%patch098 -p0 
-%patch099 -p0 
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0 
+%patch14 -p0 
+%patch15 -p0 
+%patch16 -p0 
+%patch17 -p0 
+%patch18 -p0 
+%patch19 -p0 
+%patch20 -p0 
+%patch21 -p0 
+%patch22 -p0 
+%patch23 -p0 
+%patch24 -p0 
+%patch25 -p0 
+%patch26 -p0 
+%patch27 -p0 
+%patch28 -p0 
+%patch29 -p0
+%patch30 -p0
+%patch31 -p0
+%patch32 -p0
+%patch33 -p0
+%patch34 -p0
+%patch35 -p0
+%patch36 -p0
+%patch37 -p0
+%patch38 -p0
+%patch39 -p0
+%patch40 -p0
+%patch41 -p0
+%patch42 -p0
+%patch43 -p0
+%patch44 -p0
+%patch45 -p0
+%patch46 -p0
+%patch47 -p0
+%patch48 -p0
+%patch49 -p0
+%patch50 -p0
+%patch51 -p0
+%patch52 -p0
+%patch53 -p0
+%patch54 -p0
+%patch55 -p0
+%patch56 -p0
+%patch57 -p0
+%patch58 -p0
+%patch59 -p0
+%patch60 -p0
+%patch61 -p0
+%patch62 -p0
+%patch63 -p0
+%patch64 -p0
+%patch65 -p0
+%patch66 -p0
+%patch67 -p0
+%patch68 -p0
+%patch69 -p0 
+%patch70 -p0 
+%patch71 -p0 
+%patch72 -p0 
+%patch73 -p0 
+%patch74 -p0 
+%patch75 -p0 
+%patch76 -p0 
+%patch77 -p0 
+%patch78 -p0 
+%patch79 -p0 
+%patch80 -p0 
+%patch81 -p0 
+%patch82 -p0 
+%patch83 -p0 
+%patch84 -p0 
+%patch85 -p0 
+%patch86 -p0 
+%patch87 -p0 
+%patch88 -p0 
+%patch89 -p0 
+%patch90 -p0 
+%patch91 -p0 
+%patch92 -p0 
+%patch93 -p0 
+%patch94 -p0 
+%patch95 -p0 
+%patch96 -p0 
+%patch97 -p0 
+%patch98 -p0 
+%patch99 -p0 
 %patch100 -p0 
 %patch101 -p0 
 %patch102 -p0