4 files changed, 11 insertions, 5 deletions
diff --git a/data/xsession/openbox-gnome.desktop b/data/xsession/openbox-gnome.desktop.in
index da15d1f5..19ae82e0 100644
--- a/data/xsession/openbox-gnome.desktop
+++ b/data/xsession/openbox-gnome.desktop.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=GNOME/Openbox
 Comment=Use the Openbox window manager inside of the GNOME desktop environment
-Exec=openbox-gnome-session
+Exec=@bindir@/openbox-gnome-session
 TryExec=gnome-session
 Icon=openbox.png
 Type=XSession
diff --git a/data/xsession/openbox-kde.desktop b/data/xsession/openbox-kde.desktop.in
index 1244d8d9..ddfc72d7 100644
--- a/data/xsession/openbox-kde.desktop
+++ b/data/xsession/openbox-kde.desktop.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=KDE/Openbox
 Comment=Use the Openbox window manager inside of the K Desktop Environment
-Exec=openbox-kde-session
+Exec=@bindir@/openbox-kde-session
 TryExec=startkde
 Icon=openbox.png
 Type=XSession
diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index e76d3203..c466f17d 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-AUTOSTART="$HOME/.config/openbox/autostart"
+AUTOSTART="$HOME/.config/openbox/autostart.sh"
+GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 
 if test -e $AUTOSTART; then
     # sleep for 1 second so Openbox is there before anything else
     (sleep 1 && . $AUTOSTART) &
+else
+    if test -e $GLOBALAUTOSTART; then
+        # sleep for 1 second so Openbox is there before anything else
+        (sleep 1 && . $GLOBALAUTOSTART) &
+    fi
 fi
 
 exec @bindir@/openbox "$@"
diff --git a/data/xsession/openbox.desktop b/data/xsession/openbox.desktop.in
index b162f09e..f8cb9f36 100644
--- a/data/xsession/openbox.desktop
+++ b/data/xsession/openbox.desktop.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Openbox
 Comment=Log in using the Openbox window manager (without a session manager)
-Exec=openbox-session
-TryExec=openbox-session
+Exec=@bindir@/openbox-session
+TryExec=@bidir@/openbox-session
 Icon=openbox.png
 Type=XSession