diff --git a/gvim.png b/gvim.png
deleted file mode 100644
index 82ed04f..0000000
--- a/gvim.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:931f8254408e8981f89e6d75bbcb153d73755e4f7635414d7d811bd358ceb476
-size 262
diff --git a/vim.changes b/vim.changes
index d6f73ab..6bae357 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Mar 27 11:48:28 CET 2010 - vuntz@opensuse.org
+
+- Use the icon from the tarball instead of our custom icon. It
+  looks much better.
+- Drop gvim.png from the source package.
+
 -------------------------------------------------------------------
 Tue Feb  9 17:01:46 CET 2010 - prusnak@suse.cz
 
diff --git a/vim.spec b/vim.spec
index edc98b5..027c96b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -20,7 +20,7 @@
 
 Name:           vim
 Version:        7.2
-Release:        17
+Release:        18
 #
 License:        Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
@@ -69,7 +69,6 @@ Source10:       README.Japanese-XIM
 Source13:       vitmp.c
 Source14:       vitmp.1
 Source15:       vim132
-Source16:       gvim.png
 Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source20:       spec.skeleton
@@ -390,6 +389,9 @@ export GUI_OPTIONS="\
 gcc %{optflags} %{S:13} -o vitmp
 
 %install
+#
+# create icon directory to have the icon from the tarball installed
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 %makeinstall STRIP=:
 # the last installed binary is gvim. preserve it and
 # fix its symlinks. e* was added here as it doesnt make much sense in
@@ -693,7 +695,7 @@ fi
 %{_bindir}/rgvim
 # menu icon
 %{_datadir}/applications/gvim.desktop
-%{_datadir}/pixmaps/gvim.png
+%{_datadir}/icons/hicolor/48x48/apps/gvim.png
 %if 0%{?with_splitted_gvim}
 
 %files -n gvim-enhanced