diff --git a/ChangeLog b/ChangeLog
index bf613208447608e94baff7dcc3318a8a0a44cfba..5bde458d9e6933d45fccfdaf2d73b250e742bd0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-25	Brian Tarricone <kelnos@xfce.org>
+
+	* thunar/{Makefile.am,thunar-settings,thunar-settings.desktop.in}:
+	  Include script and .desktop file to launch thunar settings dialog.
+
 2007-12-11	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-shortcuts-view.c, thunar/thunar-tree-view.c:
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 569eb129c0258898ca0c4360b38289ba55ee97d4..e6b0c92ac518cabdc7db8d549e0f5813df44f29f 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -13,6 +13,9 @@ INCLUDES =								\
 	-DTHUNAR_VERSION_API=\"$(THUNAR_VERSION_API)\"			\
 	$(PLATFORM_CPPFLAGS)
 
+bin_SCRIPTS =								\
+	thunar-settings
+
 bin_PROGRAMS =								\
 	Thunar
 
@@ -231,6 +234,11 @@ Thunar_LDADD +=								\
 	$(DBUS_LIBS)
 endif
 
+desktopdir = $(datadir)/applications
+desktop_in_files = thunar-settings.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
 # install symlink to 'thunar'
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -334,6 +342,7 @@ EXTRA_DIST =								\
 	thunar-renamer-dialog-ui.xml					\
 	thunar-standard-view-ui.xml					\
 	thunar-thumbnail-frame.png					\
-	thunar-window-ui.xml
+	thunar-window-ui.xml					\
+	$(desktop_in_files)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/thunar/thunar-settings b/thunar/thunar-settings
new file mode 100755
index 0000000000000000000000000000000000000000..faf237a8cef9ec2ffa9e8a897d4aa959935e3c68
--- /dev/null
+++ b/thunar/thunar-settings
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+test "x$DISPLAY" != "x" || DISPLAY=:0
+
+dbus-send --session --dest=org.xfce.FileManager /org/xfce/FileManager \
+    org.xfce.FileManager.DisplayPreferencesDialog "string:$DISPLAY"
diff --git a/thunar/thunar-settings.desktop.in b/thunar/thunar-settings.desktop.in
new file mode 100644
index 0000000000000000000000000000000000000000..c2324d799243378206da8e1541ed6d86d2a5ee2b
--- /dev/null
+++ b/thunar/thunar-settings.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+_Name=Thunar Settings
+_GenericName=File Manager Settings
+_X-XfceSettingsName=File Manager
+_Comment=Configure the Thunar file manager
+Exec=thunar-settings
+Icon=file-manager
+Terminal=false
+Type=Application
+Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
+StartupNotify=true