diff --git a/academic/engauge/engauge.SlackBuild b/academic/engauge/engauge.SlackBuild
index 2840fef1ae..9e50371be3 100644
--- a/academic/engauge/engauge.SlackBuild
+++ b/academic/engauge/engauge.SlackBuild
@@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -81,7 +78,7 @@ find -L . \
 
 POPPLER_INCLUDE=/usr/include/poppler/qt5 \
 POPPLER_LIB=/usr/lib${LIBDIRSUFFIX} \
-OPENJPEG_INCLUDE=/usr/include/openjpeg-2.4 \
+OPENJPEG_INCLUDE=/usr/include/openjpeg-2.5 \
 OPENJPEG_LIB=/usr/lib${LIBDIRSUFFIX} \
 qmake-qt5 \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
@@ -113,10 +110,10 @@ cp -a engauge-0.png $PKG/usr/share/pixmaps/engauge.png
 mkdir -p $PKG/usr/share/applications
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM
-cp -ar INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM
-cp -ar bin/documentation/engauge.q* $PKG/usr/doc/$PRGNAM
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar bin/documentation/engauge.q* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install