diff -ru openbox-orig/README openbox/README
--- openbox-orig/README	2008-05-05 19:23:15.000000000 -0500
+++ openbox/README	2008-07-08 00:12:23.000000000 -0500
@@ -13,9 +13,17 @@
 
 If you do not make the package with this support and you want to run 
 Openbox in KDE or GNOME, then you should copy the respective xinitrc 
-script from /usr/doc/openbox to /etc/X11/xinit/.  You will also need 
-to copy openbox-kde-session or openbox-gnome-session to /usr/bin/.  
-To be used, all the scripts will need to be executable.
+script from /usr/doc/openbox/xinit to /etc/X11/xinit/.  You will 
+also need to copy openbox-kde-session or openbox-gnome-session to 
+/usr/bin/.  To be used, all the scripts will need to be executable.
+
+NOTE: This SlackBuild nows has xinit scripts for openbox and 
+openbox-session.  You *must* select "openbox-session" in order to 
+use your autostart file.  It is recommended that you run xwmconfig 
+to correct this if you have used previous versions of this 
+SlackBuild.  Similarly, select "Openbox-Session" instead of 
+"Openbox" in KDM/XDM if you want session management and your 
+autostart file to be used.
 
 If you do not plan on using a session manager with Openbox you can 
 build a smaller binary by disabling session management support.  To 
diff -ru openbox-orig/openbox.SlackBuild openbox/openbox.SlackBuild
--- openbox-orig/openbox.SlackBuild	2008-05-05 19:23:15.000000000 -0500
+++ openbox/openbox.SlackBuild	2008-07-07 23:53:14.000000000 -0500
@@ -4,12 +4,13 @@
 
 # Written by Chess Griffin <chess@chessgriffin.com>
 # Modifications for KDE and GNOME xinitrc scripts 
+# and Slackware 12.1 KDM session fixes 
 #  by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=openbox
 VERSION=3.4.7.2
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -77,6 +78,9 @@
 # Add xinitrc.openbox so that openbox will show up as an option in xwmconfig
 install -D -m 0755 $CWD/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox
 
+# Add xinitrc.openbox-session so that openbox-session will show up as an option in xwmconfig
+install -D -m 0755 $CWD/xinitrc.openbox-session $PKG/etc/X11/xinit/xinitrc.openbox-session
+
 # Optionally install xinitrc scripts for running Openbox in KDE or GNOME
 # Move the scripts from /usr/bin if the xinitrc scripts are not installed.
 if [ "$KXINIT" == "YES" ]; then
@@ -92,12 +96,27 @@
 	rm -vf $PKG/usr/bin/openbox-gnome-session
 fi
 
+# Change name of openbox.desktop KDM session file so it corresponds to openbox-session
+( cd $PKG/usr/share/xsessions
+  mv openbox.desktop openbox-session.desktop
+  sed -i "s/Name=Openbox/Name=Openbox-Session/" openbox-session.desktop
+)
+
+# Create symlinks to KDM session desktop files so KDM will use them
+mkdir -p $PKG/usr/share/apps/kdm/sessions
+( cd $PKG/usr/share/apps/kdm/sessions
+  for i in $PKG/usr/share/xsessions/openbox*.desktop ; do
+  	ln -s /usr/share/xsessions/$(basename $i) $(basename $i) ;
+  done
+)
+
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-for i in $CWD/xinitrc.*openbox ; do
-	cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i) ;
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/xinit
+for i in $CWD/xinitrc.*openbox* ; do
+	cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/xinit/$(basename $i) ;
 done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
diff -ru openbox-orig/xinitrc.openbox openbox/xinitrc.openbox
--- openbox-orig/xinitrc.openbox	2008-05-05 19:23:15.000000000 -0500
+++ openbox/xinitrc.openbox	2008-07-07 22:55:37.000000000 -0500
@@ -31,4 +31,4 @@
   cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
 fi
 
-exec openbox-session
+exec openbox
Only in openbox: xinitrc.openbox-session