diff --git a/development/codeblocks/README b/development/codeblocks/README
index 8d254f46db..8ccc933ab5 100644
--- a/development/codeblocks/README
+++ b/development/codeblocks/README
@@ -12,5 +12,6 @@ N.B:
 a) The path for codeblocks plugins is now /usr/lib{,64}/codeblocks/plugins.
    Take care if upgrading from a previous version and you have already
    installed additional plugins (you might need to reinstall them).
-b) All contrib-plugins are disabled by default. Please uncomment line 87 in the
-   codeblocks.SlackBuild script in order to enable all contrib-plugins in your build.
+b) All contrib-plugins are disabled by default. Please invoke the script with
+      $ PLUGINS=yes ./codeblocks.SlackBuild
+   in order to enable all contrib-plugins in your build.
diff --git a/development/codeblocks/codeblocks.SlackBuild b/development/codeblocks/codeblocks.SlackBuild
index 61983299bf..272bd97f22 100644
--- a/development/codeblocks/codeblocks.SlackBuild
+++ b/development/codeblocks/codeblocks.SlackBuild
@@ -59,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvfz $CWD/$PRGNAM\_$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION.release
+tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz
 cd $PRGNAM-$VERSION.release
 chown -R root:root .
 find -L . \
@@ -69,6 +69,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+WITHPLUGINS=''
+if [ "${PLUGINS:-no}" = 'yes' ]; then
+  WITHPLUGINS='--with-contrib-plugins=all'
+fi
+
 ./bootstrap
 
 LDFLAGS="-lX11" \
@@ -76,23 +81,24 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAME-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
-  --build=$ARCH-slackware-linux # --with-contrib-plugins=all
-
-# If you want to enable all contrib-plugins, uncomment the option --with-contrib-plugins=all in the line above.
+  $WITHPLUGINS \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-gzip -9 $PKG/usr/man/man?/*.?
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS BUILD COMPILERS COPYING ChangeLog NEWS README TODO \
+cp -a \
+  AUTHORS BUGS BUILD COMPILERS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/codeblocks/doinst.sh b/development/codeblocks/doinst.sh
index 4d8a738ee2..aea0f894eb 100644
--- a/development/codeblocks/doinst.sh
+++ b/development/codeblocks/doinst.sh
@@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-if [ -e usr/share/icons/gnome/icon-theme.cache ]; then
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/gnome >/dev/null 2>&1
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-