diff --git a/system/hwinfo/hwinfo.SlackBuild b/system/hwinfo/hwinfo.SlackBuild
index 892c121204..024f29b518 100644
--- a/system/hwinfo/hwinfo.SlackBuild
+++ b/system/hwinfo/hwinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hwinfo
 
-# Copyright 2009-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2017 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hwinfo
-VERSION=${VERSION:-20.1}
+VERSION=${VERSION:-21.46}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,6 +75,8 @@ chmod -x ./git2log
 # use our CFLAGS
 sed -i "s/?= -O2/?= $SLKCFLAGS/" Makefile.common
 
+echo $VERSION > VERSION
+
 make \
   LIBDIR=/usr/lib$LIBDIRSUFFIX
 
@@ -86,7 +88,7 @@ mkdir -p $PKG/usr/man/{man1,man8}
 install -m 644 doc/hwinfo.8 $PKG/usr/man/man8/
 install -m 644 doc/*.1 $PKG/usr/man/man1/
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -95,7 +97,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 rm -rf $PKG/sbin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changelog COPYING MAINTAINER README VERSION \
+cp -a COPYING MAINTAINER README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/hwinfo/hwinfo.info b/system/hwinfo/hwinfo.info
index 31f44612c6..c036245d50 100644
--- a/system/hwinfo/hwinfo.info
+++ b/system/hwinfo/hwinfo.info
@@ -1,8 +1,8 @@
 PRGNAM="hwinfo"
-VERSION="20.1"
-HOMEPAGE="http://gitorious.org/opensuse/hwinfo"
-DOWNLOAD="http://www.liwjatan.at/files/src/hwinfo/hwinfo-20.1.tar.xz"
-MD5SUM="4e2add24d468fe9d754ac5e48dd58dcc"
+VERSION="21.46"
+HOMEPAGE="https://github.com/openSUSE/hwinfo"
+DOWNLOAD="https://github.com/openSUSE/hwinfo/archive/21.46/hwinfo-21.46.tar.gz"
+MD5SUM="954df2a0f2e3b70ac8163b531a24c3d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libx86emu"
diff --git a/system/hwinfo/slack-desc b/system/hwinfo/slack-desc
index e9d64fe8c8..cddb21ee47 100644
--- a/system/hwinfo/slack-desc
+++ b/system/hwinfo/slack-desc
@@ -11,7 +11,7 @@ hwinfo:
 hwinfo: hwinfo is a simple program that lists results
 hwinfo: from the hardware detection library.
 hwinfo:
-hwinfo: Homepage: http://gitorious.org/opensuse/hwinfo
+hwinfo: Homepage: https://github.com/openSUSE/hwinfo
 hwinfo:
 hwinfo:
 hwinfo: