diff --git a/desktop/obconf/README b/desktop/obconf/README
index b6001420de..7855aa64e5 100644
--- a/desktop/obconf/README
+++ b/desktop/obconf/README
@@ -1,4 +1,4 @@
 ObConf is a GTK+ tool to assist with the configuration of the
 Openbox window manager.
 
-Requires Openbox, which is available on SlackBuilds.org.
+This requires openbox.
diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild
index eb87178aa2..4263d69f4e 100644
--- a/desktop/obconf/obconf.SlackBuild
+++ b/desktop/obconf/obconf.SlackBuild
@@ -22,9 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Currently maintained by Robby Workman <rw@rlworkman.net>
+
 PRGNAM=obconf
-VERSION=2.0.3
-BUILD=${BUILD:-2}
+VERSION=git_cc7a188076
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -42,7 +44,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="ABOUT-NLS AUTHORS CHANGELOG COPYING README"
+DOCS="AUTHORS CHANGELOG COPYING NEWS README TODO"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -64,7 +66,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -73,13 +75,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Include a patch by Andrew Rowland to fix build errors:
+patch -p1 < $CWD/obconf_git_preview.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
diff --git a/desktop/obconf/obconf.info b/desktop/obconf/obconf.info
index d5e5658375..56a549ff40 100644
--- a/desktop/obconf/obconf.info
+++ b/desktop/obconf/obconf.info
@@ -1,10 +1,10 @@
 PRGNAM="obconf"
-VERSION="2.0.3"
-HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About"
-DOWNLOAD="http://icculus.org/openbox/obconf/obconf-2.0.3.tar.gz"
-MD5SUM="b22e273721851dedad72acbc77eefb68"
+VERSION="git_cc7a188076"
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+DOWNLOAD="ftp://harrier.slackbuilds.org/misc/obconf-git_cc7a188076.tar.xz"
+MD5SUM="6423cc63186a386abbd14a221e830f30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Chess Griffin"
-EMAIL="chess@chessgriffin.com"
-APPROVED="dsomero"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED="Erik Hanson"
diff --git a/desktop/obconf/obconf_git_preview.patch b/desktop/obconf/obconf_git_preview.patch
new file mode 100644
index 0000000000..3eec5f671c
--- /dev/null
+++ b/desktop/obconf/obconf_git_preview.patch
@@ -0,0 +1,43 @@
+Patch by Andrew Rowland <darowland@ieee.org>
+
+--- obconf-orig/src/preview.c	2012-01-13 15:51:59.000000000 -0500
++++ obconf/src/preview.c	2012-01-13 15:53:39.000000000 -0500
+@@ -327,28 +327,28 @@
+             switch (*layout) {
+             case 'D':
+                 a = focus ?
+-                    theme->btn_desk->a_focused_unpressed :
+-                    theme->btn_desk->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_desk :
++                    theme->a_unfocused_unpressed_desk;
+                 break;
+             case 'S':
+                 a = focus ?
+-                    theme->btn_shade->a_focused_unpressed :
+-                    theme->btn_shade->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_shade :
++                    theme->a_unfocused_unpressed_shade;
+                 break;
+             case 'I':
+                 a = focus ?
+-                    theme->btn_iconify->a_focused_unpressed :
+-                    theme->btn_iconify->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_iconify :
++                    theme->a_unfocused_unpressed_iconify;
+                 break;
+             case 'M':
+                 a = focus ?
+-                    theme->btn_max->a_focused_unpressed :
+-                    theme->btn_max->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_max :
++                    theme->a_unfocused_unpressed_max;
+                 break;
+             case 'C':
+                 a = focus ?
+-                    theme->btn_close->a_focused_unpressed :
+-                    theme->btn_close->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_close :
++                    theme->a_unfocused_unpressed_close;
+                 break;
+             default:
+                 continue;
diff --git a/desktop/obconf/slack-desc b/desktop/obconf/slack-desc
index a067ff3c26..131ed5944c 100644
--- a/desktop/obconf/slack-desc
+++ b/desktop/obconf/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
 obconf: ObConf (Openbox preferences manager)