diff --git a/templates/template.SlackBuild b/templates/template.SlackBuild
index 4c066c0..22588f0 100755
--- a/templates/template.SlackBuild
+++ b/templates/template.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Version: 0.6.9
+# Version: 0.6.10
 # Copyright (c) 2005-2022:
 #   Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>
 # Licensed under the terms of the GNU General Public License version 3.
@@ -213,20 +213,20 @@ for ((I = 0; I < ${#SRC_DIRNAMES[@]}; I++)); do
   case "$I" in
     0)
       # Patch before build.
-      # zcat $SRC_DIR/patches/EDITME.diff.gz | patch -p0 || die "Source patching failed for: EDITME.diff.gz"
+      # zcat "$SRC_DIR/patches/EDITME.diff.gz" | patch -p0 || die "Source patching failed for: EDITME.diff.gz"
 
       # Configure.
       CFLAGS="$BUILD_CFLAGS" CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" ./configure "${CONFIGURE_OPTS[@]}" \
-          --docdir="$BUILD_PREFIX/doc/${SRC_FILENAMES[I]%%.*}" EDITME || \
-          die "Source ./configure failed: ${SRC_DIRNAMES[I]}"
+          --docdir="$BUILD_PREFIX/doc/${SRC_FILENAMES[I]%.@(tar|tar.?z|t?z|zip)}" EDITME || \
+          die "Source ./configure failed: ${SRC_FILENAMES[I]%-*}"
 
       # Build and install.
       make -j "$BUILD_NUMJOBS" "${BUILD_MAKEFLAGS[@]}" && make -j "$BUILD_NUMJOBS" "${BUILD_MAKEFLAGS[@]}" DESTDIR="$BUILD_ROOT" install || \
-          die "Failed to build and install source: ${SRC_DIRNAMES[I]}"
+          die "Failed to build and install source: ${SRC_FILENAMES[I]%-*}"
 
       # Package documentation.
       mkdir -p -m 755 "$BUILD_ROOT/$BUILD_PREFIX/doc/${SRC_FILENAMES[I]%.@(tar|tar.?z|t?z|zip)}" && cp --parents EDITME \
-          "$BUILD_ROOT/$BUILD_PREFIX/doc/${SRC_FILENAMES[I]%.@(tar|tar.?z|t?z|zip)}" || die "Documentation copy failed: ${SRC_DIRNAMES[I]}"
+          "$BUILD_ROOT/$BUILD_PREFIX/doc/${SRC_FILENAMES[I]%.@(tar|tar.?z|t?z|zip)}" || die "Documentation copy failed: ${SRC_FILENAMES[I]%-*}"
       ;;
     *)
       die "Un-handled source file - no build configuration"