diff --git a/.cvsignore b/.cvsignore
index f9c571b..7e9e524 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-vim-7.0d-20060410.tar.bz2
-vim-7.0d-extra-20060410.tar.gz
-vim-7.0d-lang-20060410.tar.gz
+vim-7.0e-20060419.tar.bz2
+vim-7.0e-extra-20060419.tar.gz
+vim-7.0e-lang-20060419.tar.gz
 cvim.zip
diff --git a/sources b/sources
index 963ffab..6debb46 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-2cc3c386ce52049f47f100369cdc828f  vim-7.0d-20060410.tar.bz2
-42fedc22f0a8e76516a7de7b787e20ee  vim-7.0d-extra-20060410.tar.gz
-78d433a2c60088f5106ac1c6c8963ca0  vim-7.0d-lang-20060410.tar.gz
+7b0e99d26a5c0107639d249eb7b8e386  vim-7.0e-20060419.tar.bz2
+8de9267fe0deedc4bfa1ffeda25f4ac7  vim-7.0e-extra-20060419.tar.gz
+5810785a36048b94ac7c2a915dce28f6  vim-7.0e-lang-20060419.tar.gz
 1f17af2008ae94359a48be7e865b084f  cvim.zip
diff --git a/vim-7.0-fstabsyntax.patch b/vim-7.0-fstabsyntax.patch
index a9a2f4e..93f2fad 100644
--- a/vim-7.0-fstabsyntax.patch
+++ b/vim-7.0-fstabsyntax.patch
@@ -1,20 +1,11 @@
---- vim70aa/runtime/syntax/fstab.vim.orig	2006-03-14 15:57:25.000000000 +0100
-+++ vim70aa/runtime/syntax/fstab.vim	2006-03-14 16:01:05.000000000 +0100
-@@ -32,7 +32,7 @@
- " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
-+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysfs sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
- 
- " Options
- " -------
-@@ -44,7 +44,7 @@
+--- vim70e/runtime/syntax/fstab.vim.fstab	2006-04-20 13:30:57.000000000 +0200
++++ vim70e/runtime/syntax/fstab.vim	2006-04-20 13:31:24.000000000 +0200
+@@ -48,7 +48,7 @@
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
  syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab managed noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner pamconsole ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs
diff --git a/vim.spec b/vim.spec
index de9b794..ecda12d 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define CVSDATE -20060410
+%define CVSDATE -20060419
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -6,13 +6,13 @@
 %endif
 
 # Set this to 1 if you're building the enterprise version
-%define enterprise 1
+%define enterprise 0
+%define withruby 0
 
 %if %{enterprise}
 # don't include ruby interpreter
-%define withruby 0
+%define withnetbeans 0
 %else
-%define withruby 0
 %define withnetbeans 1
 %endif
 
@@ -20,8 +20,8 @@
 
 
 %define baseversion 7.0
-%define beta d
-%define vimdir vim70d
+%define beta e
+%define vimdir vim70e
 %define patchlevel 001
 
 Summary: The VIM editor.
@@ -58,8 +58,8 @@ Patch3002: vim-6.1-rh2.patch
 Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
 Patch3005: vim-6.2-rh4.patch
-Patch3006: vim-6.2-rh5.patch
-#Patch3008: vim-6.4-cvim.patch
+#Patch3006: vim-6.2-rh5.patch
+Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
 Patch3010: vim-7.0-fstabsyntax.patch
 Patch3011: vim-6.4-lib64.patch
@@ -185,7 +185,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3003 -p1
 %patch3004 -p1
 %patch3005 -p1
-%patch3006 -p1
+#patch3006 -p1
 
 %patch3009 -p1
 %patch3010 -p1
@@ -237,7 +237,7 @@ make clean
 %configure --prefix=/usr --with-features=huge --enable-pythoninterp \
  --enable-perlinterp --disable-tclinterp --with-x=no \
  --enable-gui=no --exec-prefix=/usr --enable-multibyte \
- --disable-netbeans --enable-cscope --with-modified-by="<bugzilla@redhat.com>" \
+ --enable-cscope --with-modified-by="<bugzilla@redhat.com>" \
  --with-compiledby="<bugzilla@redhat.com>" \
 %if "%{withnetbeans}" == "1"
   --enable-netbeans \
@@ -504,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Apr 20 2006 Karsten Hopp <karsten@redhat.de> 7.0.e001-1
+- vim-7.0e BETA
+
 * Tue Apr 11 2006 Karsten Hopp <karsten@redhat.de> 7.0.d001-1
 - vim-7.0d BETA