diff --git a/audio/ncmpc/README b/audio/ncmpc/README
index 229fe1c45c..0cf1d5eae3 100644
--- a/audio/ncmpc/README
+++ b/audio/ncmpc/README
@@ -1,4 +1,4 @@
-ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects 
-to a MPD running on a machine on the local network, and controls this with 
-an interface inspired by cplay. If ncmpc is used with lirc and irpty it can 
+ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects
+to a MPD running on a machine on the local network, and controls this with
+an interface inspired by cplay. If ncmpc is used with lirc and irpty it can
 be used to manage playlists and control MPD with a remote control.
diff --git a/audio/ncmpc/ncmpc.SlackBuild b/audio/ncmpc/ncmpc.SlackBuild
index d88b0b32d9..7993b2d7af 100644
--- a/audio/ncmpc/ncmpc.SlackBuild
+++ b/audio/ncmpc/ncmpc.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ncmpc
 
 # Copyright 2006-2010  Andrew Brouwers <abrouwers@gmail.com>
+# Copyright 2014  Luka Novsak <lnovsak@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=ncmpc
-VERSION=0.16
+VERSION=${VERSION:-0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,12 +57,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,16 +77,15 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  || exit 1
+  --mandir=/usr/man
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README doc/config.sample \
+cp -a AUTHORS COPYING NEWS README doc/config.sample \
   doc/keys.sample doc/ncmpc.lirc  $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/{doc,ncmpc}
 
diff --git a/audio/ncmpc/ncmpc.info b/audio/ncmpc/ncmpc.info
index df9ac117ee..afe739d475 100644
--- a/audio/ncmpc/ncmpc.info
+++ b/audio/ncmpc/ncmpc.info
@@ -1,10 +1,10 @@
 PRGNAM="ncmpc"
-VERSION="0.16"
-HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
-DOWNLOAD="http://www.musicpd.org/download/ncmpc/old/ncmpc-0.16.tar.bz2"
-MD5SUM="63b6bf666b6326c87abdea5f900a4fc3"
+VERSION="0.21"
+HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
+DOWNLOAD="http://www.musicpd.org/download/ncmpc/0/ncmpc-0.21.tar.bz2"
+MD5SUM="f26658e84ce08019bf3fe5857f6f4014"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmpdclient"
-MAINTAINER="Andrew Brouwers"
-EMAIL="abrouwers@gmail.com"
+MAINTAINER="Luka Novsak"
+EMAIL="lnovsak@gmail.com"