diff --git a/games/golly/golly.SlackBuild b/games/golly/golly.SlackBuild
index 3f7087fa1d..76634e7868 100644
--- a/games/golly/golly.SlackBuild
+++ b/games/golly/golly.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for golly
 
-# Copyright 2012, Glenn Becker, Arlington MA USA
+# Copyright 2012-14, Glenn Becker, Arlington MA USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,10 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  Updated for golly 2.6 -- the source directory structure got changed a bit too!
 
 PRGNAM=golly
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +71,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+cd 'gui-wx/configure'
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,6 +90,8 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+cd '../icons'
+
 for i in 16 32 48; do
         convert appicon${i}.ico -resize ${i}x${i}! $PRGNAM-${i}.png
         mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
@@ -97,9 +102,11 @@ done
 convert appicon.xpm $PRGNAM.png
 install -D -m 0644 $PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
+cd '../../docs'
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE README TODO \
+  License.html ReadMe.html ToDo.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/golly/golly.info b/games/golly/golly.info
index 0bd2477be5..3cc1ba1b23 100644
--- a/games/golly/golly.info
+++ b/games/golly/golly.info
@@ -1,8 +1,8 @@
 PRGNAM="golly"
-VERSION="2.4"
+VERSION="2.6"
 HOMEPAGE="http://golly.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/golly/files/golly/golly-2.4/golly-2.4-src.tar.gz"
-MD5SUM="5b928fab2dfd299b1e159757027943ef"
+DOWNLOAD="http://sourceforge.net/projects/golly/files/golly/golly-2.6/golly-2.6-src.tar.gz"
+MD5SUM="26bf9690cda7744ce0a6371ed156db8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython"