diff --git a/development/avr-binutils/avr-binutils.SlackBuild b/development/avr-binutils/avr-binutils.SlackBuild
index 16aab8c4fe..468f4d0b76 100644
--- a/development/avr-binutils/avr-binutils.SlackBuild
+++ b/development/avr-binutils/avr-binutils.SlackBuild
@@ -8,16 +8,14 @@
 # This file is placed in the public domain.
 
 PRGNAM=avr-binutils
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.21.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -47,8 +45,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf binutils-$VERSION
-tar xvf $CWD/binutils-$VERSION.tar.bz2 || exit 1
-cd binutils-$VERSION || exit 1
+tar xvf $CWD/binutils-$VERSION.tar.bz2
+cd binutils-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,8 +70,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 # Remove useless stuff
 rm -rf $PKG/usr/lib${LIBDIRSUFFIX}
@@ -85,10 +83,8 @@ rm -f $PKG/usr/man/man1/avr-windres.1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 COPYING* ChangeLog MAINTAINERS README* \
diff --git a/development/avr-binutils/avr-binutils.info b/development/avr-binutils/avr-binutils.info
index 8f8d5ab117..0299e1cee5 100644
--- a/development/avr-binutils/avr-binutils.info
+++ b/development/avr-binutils/avr-binutils.info
@@ -1,10 +1,10 @@
 PRGNAM="avr-binutils"
-VERSION="2.21"
+VERSION="2.21.1"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/binutils/binutils-2.21.tar.bz2"
-MD5SUM="c84c5acc9d266f1a7044b51c85a823f5"
+DOWNLOAD="http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2"
+MD5SUM="bde820eac53fa3a8d8696667418557ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Vliegendehuiskat"
 EMAIL="vliegendehuiskat [at] gmail [dot] com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"