diff --git a/srcpkgs/gvim/files/gvim.desktop b/srcpkgs/gvim/files/gvim.desktop
new file mode 100644
index 00000000000..26bb4a14e98
--- /dev/null
+++ b/srcpkgs/gvim/files/gvim.desktop
@@ -0,0 +1,43 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=gVim
+Name[eo]=VIM-fasado
+Name[sv]=gVim
+Name[xx]=xx
+Comment=GTK2 enhanced vim text editor
+Comment[ar]=محرر نصوص
+Comment[bg]=Текст Редактор
+Comment[de]=Texteditor
+Comment[el]=Διορθωτής Κειμένου
+Comment[eo]=Tekstredaktilo
+Comment[es]=Editor de textos
+Comment[et]=Tekstiredaktor
+Comment[eu]=Testu Editorea
+Comment[fi]=Tekstieditori
+Comment[he]=עורך טקסט
+Comment[is]=Textaritill
+Comment[ja]=テキストエディタ
+Comment[lt]=Teksto redaktorius
+Comment[mt]=Editur tat-test
+Comment[pt_BR]=Editor de Texto
+Comment[ro]=Editor de text
+Comment[ru]=редактор
+Comment[sk]=Textový editor
+Comment[sl]=Urejevalnik besedil
+Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Metin Düzenleyici
+Comment[uk]=Редактор текстів
+Comment[vi]=Trình soạn văn bản
+Comment[xx]=xx
+Comment[zh_CN]=文本编辑器
+Comment[zh_TW]=文字編輯器
+GenericName=Text Editor
+Type=Application
+TryExec=gvim
+Exec=gvim
+Icon=gvim
+Terminal=false
+X-MultipleArgs=false
+Categories=GTK;Application;Utility;TextEditor;
+MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
diff --git a/srcpkgs/gvim/template b/srcpkgs/gvim/template
index f8511d7d57d..e98fe3c6ccf 100644
--- a/srcpkgs/gvim/template
+++ b/srcpkgs/gvim/template
@@ -4,18 +4,19 @@
 # to duplicate all this stuff again!
 #
 . ${XBPS_SRCPKGDIR}/vim/template
+unset subpackages
 
 pkgname=gvim
 configure_args="${configure_args} --enable-gui=gtk2 --with-x
 --with-vim-name=gvim"
 make_install_target="-C src
-DESTDIR=$XBPS_DESTDIR/$pkgname-$version installvimbin"
+DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} installvimbin install-icons"
 short_desc="${short_desc} (GTK+ GUI)"
 long_desc="${long_desc}
 
  This packages contains gvim, the GTK+ GUI version of vim."
 
-unset subpackages
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run atk
 Add_dependency run glib
@@ -28,6 +29,7 @@ Add_dependency run libXt
 Add_dependency run libX11
 Add_dependency run libSM
 Add_dependency run libICE
+
 Add_dependency build pkg-config
 Add_dependency build atk-devel
 Add_dependency build glib-devel
@@ -40,3 +42,20 @@ Add_dependency build libXt-devel
 Add_dependency build libX11-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
+
+Add_dependency full desktop-file-utils
+Add_dependency full hicolor-icon-theme
+
+pre_install()
+{
+	sed -i "s|/locolor|/hicolor|g" ${wrksrc}/src/Makefile || return 1
+	for d in 16 32 48; do
+		install -d ${DESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps
+	done
+}
+
+post_install()
+{
+	install -D -m644 ${FILESDIR}/gvim.desktop \
+		${DESTDIR}/usr/share/applications/gvim.desktop
+}