diff --git a/system/pwgen/pwgen.SlackBuild b/system/pwgen/pwgen.SlackBuild
index 3ae97d08b1..77872706c6 100644
--- a/system/pwgen/pwgen.SlackBuild
+++ b/system/pwgen/pwgen.SlackBuild
@@ -30,7 +30,7 @@
 # No additional license terms added
 
 APP=pwgen
-VERSION=2.06
+VERSION=${VERSION:-2.07}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,19 +86,16 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-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
 
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ); do
-    ln -s $( readlink $i ).gz $i.gz;
-    rm $i;
-  done
-)
+mv $PKG/usr/share/man $PKG/usr/man
+rm -rf $PKG/usr/share
+
+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/$APP-$VERSION
-cp -t $PKG/usr/doc/$APP-$VERSION ChangeLog
 cp $CWD/$APP.SlackBuild $PKG/usr/doc/$APP-$VERSION/
 find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
 
diff --git a/system/pwgen/pwgen.info b/system/pwgen/pwgen.info
index 140d7936c0..cc4b708c2a 100644
--- a/system/pwgen/pwgen.info
+++ b/system/pwgen/pwgen.info
@@ -1,8 +1,8 @@
 PRGNAM="pwgen"
-VERSION="2.06"
+VERSION="2.07"
 HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-DOWNLOAD="http://downloads.sourceforge.net/pwgen/pwgen-2.06.tar.gz"
-MD5SUM="935aebcbe610fbc9de8125e7b7d71297"
+DOWNLOAD="http://downloads.sourceforge.net/pwgen/pwgen-2.07.tar.gz"
+MD5SUM="910b1008cdd86445e9e01305d21ee4c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""