diff --git a/dcraw/dcraw.SlackBuild b/dcraw/dcraw.SlackBuild
index 66b6ecc1eb..d682429077 100644
--- a/dcraw/dcraw.SlackBuild
+++ b/dcraw/dcraw.SlackBuild
@@ -31,91 +31,91 @@ set -eu
 CWD=$(pwd)
 
 PRGNAME=${PRGNAME:-dcraw}
-PKGNAME=$(echo $PRGNAME | tr A-Z a-z)
-VERSION=${VERSION:-9.23.0}
-PKGVERSION=$(echo $VERSION | tr - _)
+PKGNAME=$(echo ${PRGNAME} | tr A-Z a-z)
+VERSION=${VERSION:-9.25.0}
+PKGVERSION=${VERSION//-/_}
 BUILD=${BUILD:-1}
 ARCH=${ARCH:=""} # Set ARCH or leave blank to determine it automatically
 TAG=${TAG:-cf}
 TMP=${TMP:-/tmp/pkg}
-PKG=$TMP/package-$PKGNAME
-DOCS="$PKG/usr/doc/$PKGNAME-$PKGVERSION"
+PKG=${TMP}/package-${PKGNAME}
+DOCDIR="${PKG}/usr/doc/${PKGNAME}-${PKGVERSION}"
 
 # Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
+if [ -z ${ARCH:=""} ]; then
     case "$( uname -m )" in
-	i?86) ARCH=i686 ;;
-	arm*) ARCH=arm ;;
-        # Unless $ARCH is already set, use uname -m for all other archs:
-        *) ARCH=$( uname -m ) ;;
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+    # Unless ${ARCH} is already set, use uname -m for all other archs:
+    *) ARCH=$( uname -m ) ;;
     esac
 fi
 
 # Set compiling FLAGS
-case "$ARCH" in
+case "${ARCH}" in
     i[3-5]86)
-	SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"; CHOST="i486"
-	SLKLDFLAGS=""; LIBDIRSUFFIX=""
-        ;;
+    SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"; CHOST="i486"
+    SLKLDFLAGS=""; LIBDIRSUFFIX=""
+    ;;
     i686)
-	SLKCFLAGS="-O2 -march=i686 -pipe -fomit-frame-pointer"; CHOST="i486"
-	SLKLDFLAGS=""; LIBDIRSUFFIX=""
-        ;;
+    SLKCFLAGS="-O2 -march=i686 -fomit-frame-pointer"; CHOST="i486"
+    SLKLDFLAGS=""; LIBDIRSUFFIX=""
+    ;;
     x86_64)
-	SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"; CHOST="x86_64"
-	SLKLDFLAGS="-L/lib64 -L/usr/lib64"; LIBDIRSUFFIX="64"
-        ;;
+    SLKCFLAGS="-O2 -fPIC -fomit-frame-pointer"; CHOST="x86_64"
+    SLKLDFLAGS="-L/lib64 -L/usr/lib64"; LIBDIRSUFFIX="64"
+    ;;
     *)
-	SLKCFLAGS="-O2"; CHOST=$ARCH
-	SLKLDFLAGS=""; LIBDIRSUFFIX=""
-	;;
+    SLKCFLAGS="-O2"; CHOST=${ARCH}
+    SLKLDFLAGS=""; LIBDIRSUFFIX=""
+    ;;
 esac
 
 # Extract source and prepare:
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PRGNAME
-tar xvf $CWD/$PRGNAME-$VERSION.tar.gz
-cd $PRGNAME
+rm -rf ${PKG}
+mkdir -p ${TMP} ${PKG}
+cd ${TMP}
+rm -rf ${PRGNAME}
+tar xvf ${CWD}/${PRGNAME}-${VERSION}.tar.gz
+cd ${PRGNAME}
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Build and install:
-gcc $SLKCFLAGS $SLKLDFLAGS \
-	-o dcraw dcraw.c \
-	-lm -ljpeg -llcms2 -lpng -ltiff -ljasper \
-	-DLOCALEDIR=\"/usr/share/locale/\"
+gcc ${SLKCFLAGS} ${SLKLDFLAGS} \
+    -o dcraw dcraw.c \
+    -lm -ljpeg -llcms2 -lpng -ltiff -ljasper \
+    -DLOCALEDIR=\"/usr/share/locale/\"
 
-install -Dsm755 dcraw $PKG/usr/bin/dcraw
-install -Dm644 dcraw.1 $PKG/usr/man/man1/dcraw.1
+install -Dsm755 dcraw ${PKG}/usr/bin/dcraw
+install -Dm644 dcraw.1 ${PKG}/usr/man/man1/dcraw.1
 for i in dcraw_*.po; do j=${i#dcraw_};LANG=${j%.*}; 
-  install -Dm644 dcraw_${LANG}.1 $PKG/usr/man/${LANG}.UTF-8/man1/dcraw.1 || true
-  mkdir -p $PKG/usr/share/locale/${LANG}/LC_MESSAGES
-  msgfmt -o $PKG/usr/share/locale/${LANG}/LC_MESSAGES/dcraw.mo dcraw_${LANG}.po || true
+  install -Dm644 dcraw_${LANG}.1 ${PKG}/usr/man/${LANG}.UTF-8/man1/dcraw.1 || true
+  mkdir -p ${PKG}/usr/share/locale/${LANG}/LC_MESSAGES
+  msgfmt -o ${PKG}/usr/share/locale/${LANG}/LC_MESSAGES/dcraw.mo dcraw_${LANG}.po || true
 done
 
 # Compress manpages
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+find ${PKG}/usr/man -type f -exec chmod 644 {} \; -exec gzip -9 {} \;
 
 # Remove empty directories
-find $PKG -depth -empty -type d -exec rmdir '{}' \;
+find ${PKG} -depth -empty -type d -exec rmdir '{}' \;
 
 # Install gimp plugin
 if [ -x /usr/bin/gimptool-2.0 ]; then
-	/usr/bin/gimptool-2.0 --build $CWD/rawphoto.c
-	install -D -m 0755 rawphoto $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins/rawphoto
+    /usr/bin/gimptool-2.0 --build ${CWD}/rawphoto.c
+    install -D -m 0755 rawphoto ${PKG}/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins/rawphoto
 fi
 
 # Add a slackbuild script:
-install -Dm644 $CWD/$PKGNAME.SlackBuild $DOCS/$PKGNAME.SlackBuild
-head -25 dcraw.c > $DOCS/LICENSE
+install -Dm644 ${CWD}/${PKGNAME}.SlackBuild ${DOCDIR}/${PKGNAME}.SlackBuild
+head -25 dcraw.c > ${DOCDIR}/LICENSE
 
 # Add slack-desc
-install -Dm644 $CWD/slack-desc $PKG/install/slack-desc
+install -Dm644 ${CWD}/slack-desc ${PKG}/install/slack-desc
 
 # Create package:
-cd $PKG
-/sbin/makepkg -l y -c n $CWD/$PKGNAME-$PKGVERSION-$ARCH-${BUILD}${TAG}.txz
+cd ${PKG}
+/sbin/makepkg -l y -c n ${CWD}/${PKGNAME}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz
diff --git a/dcraw/dcraw.info b/dcraw/dcraw.info
index acfe2acf91..e1f5201f2b 100644
--- a/dcraw/dcraw.info
+++ b/dcraw/dcraw.info
@@ -1,10 +1,11 @@
 NAME="dcraw"
-VERSION="9.23.0"
+VERSION="9.25.0"
 HOMEPAGE="http://cybercom.net/~dcoffin/dcraw/"
-DOWNLOAD="http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.23.0.tar.gz"
-FILENAME="dcraw-9.23.0.tar.gz"
-DOWNLOAD_1="http://cybercom.net/~dcoffin/dcraw/rawphoto.c"
+DOWNLOAD="http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.25.0.tar.gz"
+FILENAME="dcraw-9.25.0.tar.gz"
 REQUIRES=""
-MD5SUM="dc5a3da19988d9495e5b80d9f44d748b"
-MD5SUM_1="2bf4adc85b60aeeaffd7dc65bf9e96ad"
-SHASUM="6821b898e7e0a23c010937adcc50097e51bdf9d7"
+MD5SUM="92fdbd7fdc73fefd8baa9394be59898d"
+SHASUM="0c598ea240d73de706d21199163702d06e7400e2"
+EXTRAFILE_1="http://cybercom.net/~dcoffin/dcraw/rawphoto.c"
+MD5SUM_EXTRAFILE_1="2bf4adc85b60aeeaffd7dc65bf9e96ad"
+