diff --git a/vim.spec b/vim.spec
index 2add7ff..f3de443 100644
--- a/vim.spec
+++ b/vim.spec
@@ -92,7 +92,8 @@ 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
+# VMS, Amiga, DOS, OS2
+#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
@@ -131,7 +132,8 @@ 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
+# GVimEXT:
+#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
@@ -256,8 +258,8 @@ vim-common package.
 
 %prep
 %setup -q -b 0 -n %{vimdir}
-%setup -q -b 1 -n %{vimdir}
-%setup -q -b 2 -n %{vimdir}
+%{__tar} xzf %{SOURCE1}
+%{__tar} xzf %{SOURCE2}
 # fix rogue dependencies from sample code
 chmod -x runtime/tools/mve.awk
 %patch2002 -p1
@@ -313,7 +315,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch039 -p0
 %patch040 -p0
 # DOS, Amiga, OS2, VMS:
-%patch041 -p0
+#patch041 -p0
 %patch042 -p0
 %patch043 -p0
 %patch044 -p0
@@ -355,7 +357,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch077 -p0 
 %patch078 -p0 
 %patch079 -p0 
-%patch080 -p0 
+# GVimEXT:
+#patch080 -p0 
 %patch081 -p0 
 %patch082 -p0 
 %patch083 -p0