diff --git a/s390-tools.changes b/s390-tools.changes
index addb276..48e833b 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Feb 21 19:38:18 UTC 2019 - mpost@suse.com
+
+- Now that IBM has the package on github, use a full source URL.
+- Change Pre-Req to Requires(pre) and (post), and remove dracut.
+- Changed the group for the hmcdrvfs package from Base:System to
+  Base/Filesystems
+- Institute the %autosetup macro.
+- Remove erroneous %dir entry for %_unitdir
+- Change bash-specific "==" tests in scriptlets with a more
+  generic "=".
+
+-------------------------------------------------------------------
+Thu Feb 14 23:53:57 UTC 2019 - mpost@suse.com
+
+- Modified the spec file to add a group named cpacfstats
+  (bsc#1123730)
+
 -------------------------------------------------------------------
 Mon Jan 28 17:38:15 UTC 2019 - mpost@suse.com
 
diff --git a/s390-tools.spec b/s390-tools.spec
index 3f63bce..082984f 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -28,7 +28,7 @@ Summary:        S/390 tools like zipl and dasdfmt
 License:        MIT
 Group:          System/Kernel
 URL:            https://github.com/ibm-s390-tools/s390-tools
-Source:         s390-tools-%{version}.tar.gz
+Source:         https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
 Source1:        s390-tools-rpmlintrc
 Source2:        zipl.conf
 Source3:        hsnc
@@ -205,7 +205,8 @@ BuildRequires:  tcpd-devel
 BuildRequires:  zlib-devel-static
 # Don't build with pie to avoid problems with zipl
 #!BuildIgnore:  gcc-PIE
-PreReq:         shadow %fillup_prereq dracut permissions
+Requires(pre):  shadow
+Requires(post): %fillup_prereq permissions
 Requires:       coreutils
 Requires:       gawk
 Requires:       perl-base
@@ -258,7 +259,7 @@ represented as a file in that directory.
 %package hmcdrvfs
 Summary:        HMC drive file system based on FUSE
 License:        GPL-2.0-only
-Group:          System/Base
+Group:          System/Filesystems
 Requires:       fuse
 
 %description hmcdrvfs
@@ -266,111 +267,7 @@ This package contains a HMC drive file system based on FUSE and a tool
 to list files and directories.
 
 %prep
-%setup -q
-
-# SUSE patches
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
-%patch74 -p1
-%patch75 -p1
-%patch76 -p1
-%patch77 -p1
-%patch78 -p1
-%patch79 -p1
-%patch80 -p1
-%patch81 -p1
-%patch82 -p1
-%patch83 -p1
-%patch84 -p1
-%patch85 -p1
-%patch86 -p1
-%patch87 -p1
-%patch88 -p1
-%patch89 -p1
-%patch90 -p1
-%patch91 -p1
-%patch92 -p1
-%patch93 -p1
-%patch94 -p1
-%patch95 -p1
-%patch96 -p1
-%patch97 -p1
-%patch98 -p1
-%patch99 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
+%autosetup -p1
 
 cp -vi %{SOURCE22} CAUTION
 
@@ -517,6 +414,8 @@ chmod 755 osasnmpd
 getent group ts-shell >/dev/null 2>&1 || groupadd -r ts-shell
 # check for zkeyadm group or create it
 getent group zkeyadm >/dev/null 2>&1 || groupadd -r zkeyadm
+# check for cpacfstats group or create it
+getent group cpacfstats >/dev/null 2>&1 || groupadd -r cpacfstats
 %service_add_pre appldata.service
 %service_add_pre cio_ignore.service
 %service_add_pre cpacfstatsd.service
@@ -532,7 +431,7 @@ getent group zkeyadm >/dev/null 2>&1 || groupadd -r zkeyadm
 
 %post
 read INITPGM < /proc/1/comm
-if [ "${INITPGM}" == "systemd" ]; then
+if [ "${INITPGM}" = "systemd" ]; then
   echo "Running systemctl daemon-reload."
   systemctl daemon-reload
 fi
@@ -605,7 +504,7 @@ grep -q '^%{_bindir}/ts-shell$' %{_sysconfdir}/shells \
 # run it, so we have to make sure we can safely issue the
 # systemctl command.
 read INITPGM < /proc/1/comm
-if [ "${INITPGM}" == "systemd" ]; then
+if [ "${INITPGM}" = "systemd" ]; then
   echo "Running systemctl daemon-reload."
   systemctl daemon-reload
 fi
@@ -655,7 +554,6 @@ fi
 %dir %{_prefix}/lib/s390-tools/zfcpdump
 %dir %{_prefix}/lib/udev/rules.d
 %dir %{_prefix}/lib/systemd/scripts
-%dir %{_unitdir}
 %dir %{_datadir}/s390-tools
 %dir %{_datadir}/s390-tools/cpumf
 %dir %{_datadir}/s390-tools/netboot