diff --git a/ChangeLog b/ChangeLog
index 9ab34f6f637830ecfcba93d49b629a1b6d44c818..a7a951f5a1621a8706fd6359b75f1324bcd0ba76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-04	Jannis Pohlmann <jannis@xfce.org>
+
+	* thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in: Use
+	  Type=X-Thumbnailer instead of Type=X-XFCE-Thumbnailer and 
+	  X-Thumbnailer-Exec instead of Exec (bug #4821).
+
 2009-01-25	Nick Schermer <nick@xfce.org>
 
 	* thunar/thunar-path-entry.c: Fix crash when entering the same 
diff --git a/thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in b/thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in
index 47c2635c813a5e9d2288f29d9c2db0509b4e5af4..8872c1a2aa24adf0dd6aa300a714f2e8be4a5758 100644
--- a/thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in
+++ b/thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-Type=X-XFCE-Thumbnailer
+Type=X-Thumbnailer
 Name=Thunar Font Thumbnailer
 Comment=Creates thumbnails for font files
 TryExec=@libexecdir@/thunar-vfs-font-thumbnailer-1
-Exec=@libexecdir@/thunar-vfs-font-thumbnailer-1 -i %i -o %o -s %s
 MimeType=application/x-font-otf;application/x-font-pcf;application/x-font-ttf;application/x-font-type1;
+X-Thumbnailer-Exec=@libexecdir@/thunar-vfs-font-thumbnailer-1 -i %i -o %o -s %s
 
 # vi:set encoding=UTF-8: