diff --git a/ChangeLog b/ChangeLog
index 25db40d4413a1579cbe1515cd30a7b649ba158a9..041211c06f8c6afdc04d6aba07ae7c4164709508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05	Benedikt Meurer <benny@xfce.org>
+
+	* Thunar-folder-handler.desktop.in, Makefile.am: Install folder handler
+	  .desktop file for Thunar. This way firefox and thunderbird can use
+	  Thunar to open folders.
+
 2006-03-05	Benedikt Meurer <benny@xfce.org>
 
 	* configure.in.in: Bump version to 0.2.3svn.
diff --git a/Makefile.am b/Makefile.am
index 13bb3b9aa48a468d4de62a3d656f000ca5f35519..ae59880759429ad8b5f16e08eec244f284838a1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ ThunarHelp: ThunarHelp.in Makefile
 	mv ThunarHelp.gen ThunarHelp
 
 desktopdir = $(datadir)/applications
-desktop_in_files = Thunar.desktop.in
+desktop_in_files = Thunar.desktop.in Thunar-folder-handler.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/Thunar-folder-handler.desktop.in b/Thunar-folder-handler.desktop.in
new file mode 100644
index 0000000000000000000000000000000000000000..2801e831bec05f265711c06064fe2cafba96c02b
--- /dev/null
+++ b/Thunar-folder-handler.desktop.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Open Folder
+_Comment=Open the specified folders in Thunar
+TryExec=Thunar
+Exec=Thunar %F
+Icon=Thunar
+NoDisplay=true
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;Utility;Core;GTK;
+MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;
+
+# vi:set encoding=UTF-8: