diff --git a/vim-7.1-rpmlintrc b/vim-7.1-rpmlintrc
new file mode 100644
index 0000000..ff75f38
--- /dev/null
+++ b/vim-7.1-rpmlintrc
@@ -0,0 +1,3 @@
+addFilter("vim-data devel-file-in-non-devel-package")
+addFilter("vim-data file-not-in-%lang")
+
diff --git a/vim.changes b/vim.changes
index 6c5658c..7518754 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 26 14:28:16 CEST 2007 - mkoenig@suse.de
+
+- avoid duplicate installs of manpages [#294155]
+- remove old Obsoletes for vim-fat
+
 -------------------------------------------------------------------
 Mon Jul  9 14:26:23 CEST 2007 - mkoenig@suse.de
 
diff --git a/vim.spec b/vim.spec
index 848ecd8..4deacd8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -12,13 +12,13 @@
 
 Name:           vim
 Version:        7.1
-Release:        11
+Release:        17
 #
 License:        Other uncritical OpenSource License, http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  db-devel gettext-devel gpm gtk2-devel libacl-devel ncurses-devel python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
+BuildRequires:  db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
 #
 %define pkg_version 7.1
 %define official_ptchlvl 243
@@ -65,6 +65,7 @@ Source16:       gvim.png
 Source17:       apparmor.vim
 Source18:       missing-vim-client
 Source19:       gvim.desktop
+Source99:       vim-7.1-rpmlintrc
 #Patch0:         %{name}-7.1-official_patches_001-%{official_ptchlvl}.bz2
 Patch1:         %{name}-7.0-no_nb.patch
 Patch3:         %{name}-7.0-filetype_ycp.patch
@@ -170,7 +171,6 @@ PreReq:         %{vim_prereq}
 PreReq:         update-alternatives
 Provides:       vi_clone
 Provides:       vim_client
-Obsoletes:      vim-fat
 #
 Summary:        A version of the VIM editor which includes recent enhancements
 
@@ -406,6 +406,19 @@ done
 #
 # stupid helper
 %{__install} -m 0755 %{S:18} %{buildroot}%{_datadir}/vim/current/tools/missing-vim-client
+# remove unecessary duplicate manpages
+rm -rf %{buildroot}%{_mandir}/fr.ISO8859-1/
+rm -rf %{buildroot}%{_mandir}/fr.UTF-8/
+rm -rf %{buildroot}%{_mandir}/pl.ISO8859-2/
+rm -rf %{buildroot}%{_mandir}/pl.UTF-8/
+rm -rf %{buildroot}%{_mandir}/ru.KOI8-R/
+rm -rf %{buildroot}%{_mandir}/it.ISO8859-1/
+rm -rf %{buildroot}%{_mandir}/it.UTF-8/
+# and move russian manpages to a place where they can be found
+mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru
+#
+
+%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -491,36 +504,15 @@ fi
 %dir %{_mandir}/fr
 %dir %{_mandir}/fr/man1/
 %{_mandir}/fr/man1/*
-%dir %{_mandir}/fr.ISO8859-1
-%dir %{_mandir}/fr.ISO8859-1/man1/
-%{_mandir}/fr.ISO8859-1/man1/*
-%dir %{_mandir}/fr.UTF-8
-%dir %{_mandir}/fr.UTF-8/man1/
-%{_mandir}/fr.UTF-8/man1/*
 %dir %{_mandir}/it
 %dir %{_mandir}/it/man1/
 %{_mandir}/it/man1/*
-%dir %{_mandir}/it.ISO8859-1
-%dir %{_mandir}/it.ISO8859-1/man1/
-%{_mandir}/it.ISO8859-1/man1/*
-%dir %{_mandir}/it.UTF-8
-%dir %{_mandir}/it.UTF-8/man1/
-%{_mandir}/it.UTF-8/man1/*
-%dir %{_mandir}/ru.KOI8-R
-%dir %{_mandir}/ru.KOI8-R/man1/
-%{_mandir}/ru.KOI8-R/man1/*
-%dir %{_mandir}/ru.UTF-8
-%dir %{_mandir}/ru.UTF-8/man1/
-%{_mandir}/ru.UTF-8/man1/*
-%dir %{_mandir}/pl.UTF-8
-%dir %{_mandir}/pl.UTF-8/man1/
-%{_mandir}/pl.UTF-8/man1/*
+%dir %{_mandir}/ru
+%dir %{_mandir}/ru/man1/
+%{_mandir}/ru/man1/*
 %dir %{_mandir}/pl
 %dir %{_mandir}/pl/man1/
 %{_mandir}/pl/man1/*
-%dir %{_mandir}/pl.ISO8859-2
-%dir %{_mandir}/pl.ISO8859-2/man1/
-%{_mandir}/pl.ISO8859-2/man1/*
 # docs and data file
 %doc %{_docdir}/vim
 #
@@ -639,6 +631,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 26 2007 - mkoenig@suse.de
+- avoid duplicate installs of manpages [#294155]
+- remove old Obsoletes for vim-fat
 * Mon Jul 09 2007 - mkoenig@suse.de
 - fix spec syntax rules
 * Thu Jul 05 2007 - coolo@suse.de