diff --git a/build-devkit.sh b/build-devkit.sh
index 76bc2b6..7526067 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -283,10 +283,13 @@ done
 # Build and install devkit components
 #---------------------------------------------------------------------------------
 if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
-if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 
-if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] ; then
-	if [ -f $scriptdir/build-libs.sh ]; then . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR; fi
+if [ "$BUILD_DKPRO_SKIP_TOOLS" != 1 ] && [ -f $scriptdir/build-tools.sh ]; then
+ . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
+fi
+
+if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
+  . $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
 fi
 
 if [ ! -z $CROSSBUILD ]; then