diff --git a/vim.changes b/vim.changes
index c70143b..b5634f3 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 27 07:17:53 UTC 2010 - aj@suse.de
+
+- Fix rpmlint warnings about duplicate files.
+- Remove now obsolete option --with-xusetheXWindowSystem.
+- Do not record build time in binary
+
 -------------------------------------------------------------------
 Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de
 
diff --git a/vim.spec b/vim.spec
index cb040ac..9957406 100644
--- a/vim.spec
+++ b/vim.spec
@@ -20,7 +20,7 @@
 
 Name:           vim
 Version:        7.2
-Release:        19
+Release:        26
 #
 License:        Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
@@ -113,7 +113,7 @@ file name completion, block operations, and editing of binary data.
 Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions
 of UNIX.
 
-For SuSE Linux, Vim is used as /usr/bin/vi.
+For SUSE Linux, Vim is used as /usr/bin/vi.
 
 Package vim contains the normal version of vim. To get the full runtime
 environment install additionally vim-data.
@@ -144,7 +144,7 @@ file name completion, block operations, and editing of binary data.
 Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions
 of UNIX.
 
-For SuSE Linux, Vim is used as /usr/bin/vi.
+For SUSE Linux, Vim is used as /usr/bin/vi.
 
 Package vim-data contains the runtime files.
 
@@ -172,7 +172,7 @@ file name completion, block operations, and editing of binary data.
 Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions
 of UNIX.
 
-For SuSE Linux, Vim is used as /usr/bin/vi.
+For SUSE Linux, Vim is used as /usr/bin/vi.
 
 Package vim-base contains the common files needed for all different vim
 versions. You still need to select at least one of the vim,
@@ -272,8 +272,6 @@ Requires:       %{perl_requires}
 Summary:        A GUI for Vi
 
 %description -n gvim
-Start: /usr/X11R6/bin/gvim
-
 Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed.
 
 Package gvim contains the largest set of features of vim, which is
@@ -352,7 +350,6 @@ export GUI_OPTIONS="\
     --enable-xim \
     --enable-fontset \
     --enable-gnome-check \
-    --with-xusetheXWindowSystem \
     --enable-gui=gnome2 \
     --enable-gtk2-check \
     --with-gtk-prefix=/opt/gnome \
@@ -363,18 +360,21 @@ export GUI_OPTIONS="\
     ${COMMON_OPTIONS} --disable-gui --without-x --disable-gpm \
     --disable-perlinterp --disable-pythoninterp \
     --disable-rubyinterp --disable-tclinterp
+sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
 %make
 %{__cp} src/vim vim-normal
 %{__make} distclean
 #
 # build enhanced binary
 %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui
+sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
 %make
 %{__cp} src/vim vim-enhanced
 %{__make} distclean
 #
 # build enhanced gvim binary
 %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS}
+sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
 %if 0%{?with_splitted_gvim}
 %make
 %{__cp} src/vim gvim-enhanced
@@ -382,6 +382,7 @@ export GUI_OPTIONS="\
 #
 # build gvim binary
 %configure ${COMMON_OPTIONS} ${GUI_OPTIONS}
+sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
 %endif
 %make
 #
@@ -477,6 +478,8 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c
 rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c
 #
 %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang
+%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor
+%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin
 
 %clean
 %{__rm} -rf %{buildroot}