diff --git a/powerd-2.0.2.dif b/powerd-2.0.2.dif
index ec4450e..e29c9cd 100644
--- a/powerd-2.0.2.dif
+++ b/powerd-2.0.2.dif
@@ -1,3 +1,23 @@
+--- COPYING
++++ COPYING	2014-01-14 10:28:52.282236069 +0000
+@@ -2,7 +2,7 @@
+ 		       Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+ 
+ Also add information on how to contact you by electronic and paper mail.
 --- Makefile.in
 +++ Makefile.in	2006-02-07 16:29:20.000000000 +0100
 @@ -28,7 +28,7 @@ distclean: clean
@@ -17,7 +37,7 @@
   */
 -#define PWRSTAT         "/etc/powerstatus"
 +#define PWRSTAT		"/var/run/powerstatus"
-+#if defined(linux)
++#if WITH_SYSVINIT
 +# include <initreq.h>
 +# define NEWINIT
 +# define INIT_REQ_SLEEP 5
@@ -25,6 +45,24 @@
  
  
  /* Define this if you want to develop on powerd. This will cause powerd to 
+--- powerd.8
++++ powerd.8	2014-01-14 10:59:42.198735732 +0000
+@@ -104,13 +104,10 @@ for more information
+ .br
+ /etc/powerd.conf	powerd configuration file
+ .br
+-/etc/powerstatus	indicates line power status
+-.br
+-/etc/inittab		init is what actually issues the 
+-				shutdown
++/var/run/powerstatus	indicates line power status
+ .br
+ .SH SEE ALSO
+-powerd(8), shutdown(8), wall(1), init(8), inittab(5).
++powerd(8), shutdown(8), wall(1), init(8).
+ .SH AUTHOR
+ James Brents <James@nistix.com>
+ (with parts of this man page borrowed from all over the Linux community)
 --- powerd.c
 +++ powerd.c	2008-01-10 10:48:25.967567115 +0100
 @@ -27,7 +27,6 @@
@@ -267,3 +305,83 @@
  int notifyclients(int status);
  void getrid(FileDescriptor *fd, int i);
  void bsdshutdown(int status);
+--- initreq.h
++++ initreq.h	2013-08-13 20:02:46.132705014 +0000
+@@ -0,0 +1,77 @@
++/*
++ * initreq.h	Interface to talk to init through /dev/initctl.
++ *
++ *		Copyright (C) 1995-2004 Miquel van Smoorenburg
++ *
++ *		This library is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU Lesser General Public
++ *		License as published by the Free Software Foundation; either
++ *		version 2 of the License, or (at your option) any later version.
++ *
++ * Version:     @(#)initreq.h  1.28  31-Mar-2004 MvS
++ *
++ */
++#ifndef _INITREQ_H
++#define _INITREQ_H
++
++#include <sys/param.h>
++
++#if defined(__FreeBSD_kernel__)
++#  define INIT_FIFO  "/etc/.initctl"
++#else
++#  define INIT_FIFO  "/dev/initctl"
++#endif
++
++#define INIT_MAGIC 0x03091969
++#define INIT_CMD_START		0
++#define INIT_CMD_RUNLVL		1
++#define INIT_CMD_POWERFAIL	2
++#define INIT_CMD_POWERFAILNOW	3
++#define INIT_CMD_POWEROK	4
++#define INIT_CMD_BSD		5
++#define INIT_CMD_SETENV		6
++#define INIT_CMD_UNSETENV	7
++
++#define INIT_CMD_CHANGECONS	12345
++
++#ifdef MAXHOSTNAMELEN
++#  define INITRQ_HLEN	MAXHOSTNAMELEN
++#else
++#  define INITRQ_HLEN	64
++#endif
++
++/*
++ *	This is what BSD 4.4 uses when talking to init.
++ *	Linux doesn't use this right now.
++ */
++struct init_request_bsd {
++	char	gen_id[8];		/* Beats me.. telnetd uses "fe" */
++	char	tty_id[16];		/* Tty name minus /dev/tty      */
++	char	host[INITRQ_HLEN];	/* Hostname                     */
++	char	term_type[16];		/* Terminal type                */
++	int	signal;			/* Signal to send               */
++	int	pid;			/* Process to send to           */
++	char	exec_name[128];	        /* Program to execute           */
++	char	reserved[128];		/* For future expansion.        */
++};
++
++
++/*
++ *	Because of legacy interfaces, "runlevel" and "sleeptime"
++ *	aren't in a separate struct in the union.
++ *
++ *	The weird sizes are because init expects the whole
++ *	struct to be 384 bytes.
++ */
++struct init_request {
++	int	magic;			/* Magic number                 */
++	int	cmd;			/* What kind of request         */
++	int	runlevel;		/* Runlevel to change to        */
++	int	sleeptime;		/* Time between TERM and KILL   */
++	union {
++		struct init_request_bsd	bsd;
++		char			data[368];
++	} i;
++};
++
++#endif
diff --git a/powerd.service b/powerd.service
new file mode 100644
index 0000000..14d6846
--- /dev/null
+++ b/powerd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Power Daemon
+Documentation=man:powerd(8)
+ConditionPathExists=/etc/powerd.conf
+
+[Service]
+Type=forking
+PIDFile=/var/run/powerd.pid
+ExecStart=/sbin/powerd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/powerd.spec b/powerd.spec
new file mode 100644
index 0000000..973db2b
--- /dev/null
+++ b/powerd.spec
@@ -0,0 +1,122 @@
+#
+# spec file for package powerd
+#
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%if %{undefined systemd_requires}
+%global         with_sysvinit 1
+%endif
+%bcond_with     sysvinit
+
+Name:           powerd
+Version:        2.0.2
+Release:        0
+Summary:        UPS monitoring daemon
+License:        GPL-2.0+
+Group:          System/Base
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1140
+BuildRequires:  pkg-config
+BuildRequires:  systemd-devel
+%endif
+Url:            https://power.sourceforge.net/
+Source0:        powerd-%{version}.tar.bz2
+Source1:        rc.powerd
+Source2:        powerd.service
+Patch0:         powerd-%{version}.dif
+Patch1:         powerd-%{version}-getaddrinfo.patch
+%if %{without sysvinit}
+%{expand: %%global sysdsysunitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
+%{expand: %%global sysdsysconfdir %(pkg-config systemd --variable=systemdsystemconfdir)}
+%endif
+
+%description -n powerd
+powerd monitors the serial port connected to an UPS device and will perform
+an unattended shutdown of the system if the UPS is on battery longer
+than a specified number of minutes.
+
+%prep
+%setup -q
+%patch0
+%patch1
+%_fixowner .
+%_fixgroup .
+/bin/chmod -Rf a+rX,g-w,o-w .
+
+%build
+  RPM_OPT_FLAGS="${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe"
+  CC=%__cc
+  export RPM_OPT_FLAGS CC
+  %configure --prefix= --bindir='$(DESTDIR)/sbin' \
+	--mandir='$(DESTDIR)%{_mandir}' \
+	--sbindir='$(DESTDIR)/sbin'
+%if %{with sysvinit}
+  make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT"
+%else
+  make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS "
+%endif
+
+%install
+  mkdir -m 755 -p %{buildroot}/etc
+  mkdir -m 755 -p %{buildroot}/sbin
+  mkdir -m 755 -p %{buildroot}%{_mandir}/man8
+  make install DESTDIR=%{buildroot}
+  echo '# ' > %{buildroot}/etc/powerd.conf
+  echo '# /etc/powerd.conf  for powerd version-2.02' >> %{buildroot}/etc/powerd.conf
+  echo '# ' >> %{buildroot}/etc/powerd.conf
+  echo '# read manual page of detectups(8) and powerd(8) its self.' >> %{buildroot}/etc/powerd.conf
+  echo '# ' >> %{buildroot}/etc/powerd.conf
+  echo '# to enable powerd service run the command' >> %{buildroot}/etc/powerd.conf
+%if %{with sysvinit}
+  echo '#    insserv powerd' >> %{buildroot}/etc/powerd.conf
+  echo '#    rcpowerd start' >> %{buildroot}/etc/powerd.conf
+  mkdir -p %{buildroot}/etc/init.d
+  install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
+  ln -sf /etc/init.d/powerd %{buildroot}/sbin/rcpowerd
+%else
+  echo '#    systemctl enable powerd.service' >> %{buildroot}/etc/powerd.conf
+  echo '#    systemctl start  powerd.service' >> %{buildroot}/etc/powerd.conf
+  mkdir -p %{buildroot}/%{sysdsysunitdir}
+  install -m 0644 %{S:2} %{buildroot}/%{sysdsysunitdir}/powerd.service
+%endif
+
+%preun
+%stop_on_removal powerd
+
+%postun
+%restart_on_update powerd
+%if %{with sysvinit}
+%insserv_cleanup
+%endif
+
+%files -n powerd
+%defattr (-,root,root,755)
+%doc README COPYING SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
+/sbin/powerd
+/sbin/detectups
+%if %{with sysvinit}
+/sbin/rcpowerd
+%endif
+%config /etc/powerd.conf
+%if %{with sysvinit}
+%config /etc/init.d/powerd
+%else
+%attr(0644,root,root) %{sysdsysunitdir}/powerd.service
+%endif
+%doc %{_mandir}/man8/powerd.8.gz
+%doc %{_mandir}/man8/detectups.8.gz
+
+%changelog
diff --git a/sysvinit.changes b/sysvinit.changes
index a6741b0..848f61d 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 14 11:04:52 UTC 2014 - werner@suse.de
+
+- Split off powerd from sysvinit
+- Make powerd work together with systemd 
+
 -------------------------------------------------------------------
 Tue Jul 23 11:58:05 CEST 2013 - ohering@suse.de
 
diff --git a/sysvinit.spec b/sysvinit.spec
index 2cb68e6..fb2f591 100644
--- a/sysvinit.spec
+++ b/sysvinit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sysvinit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,16 @@
 #
 
 
-%bcond_with	util_linux
 %if 0%{suse_version} < 1300
-%global with_util_linux 1
+%global         with_util_linux 1
 %endif
+%bcond_with	util_linux
+%if %{undefined systemd_requires}
+%global         with_sysvinit 1
+%endif
+%bcond_with     sysvinit
 
 Name:           sysvinit
-%define PDVER  2.0.2
 %define KPVER  2.21
 %define SCVER  1.16
 %define SIVER  2.88+
@@ -37,16 +40,18 @@ BuildRequires:  audit-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libsepol-devel
 BuildRequires:  pam-devel
+%if 0%{?suse_version} > 1140
+BuildRequires:  pkg-config
+BuildRequires:  systemd-devel
+%endif
 #!BuildIgnore:  sysvinit-tools
 Requires(post): coreutils grep mkinitrd
 Requires(postun): mkinitrd
 Url:            http://savannah.nongnu.org/projects/sysvinit/
 Source:         sysvinit-%{SIVER}dsf.tar.bz2
 Source2:        killproc-%{KPVER}.tar.bz2
-Source3:        powerd-%{PDVER}.tar.bz2
 Source4:        showconsole-%{SCVER}.tar.bz2
 Source5:        startpar-%{START}.tar.bz2
-Source6:        rc.powerd
 Source7:        %{name}-rpmlintrc
 Source8:        mkinitrd-boot.sh
 Source9:        mkinitrd-kill1.sh
@@ -63,8 +68,6 @@ Patch8:         %{name}-%{version}dsf-blowfish.dif
 Patch9:         %{name}-2.88dsf-no-kill.patch
 Patch10:        %{name}-%{version}dsf-env.patch
 Patch11:        %{name}-%{version}dsf-dostat.patch
-Patch20:        powerd-%{PDVER}.dif
-Patch21:        powerd-%{PDVER}-getaddrinfo.patch
 Patch30:        killproc-%{KPVER}.dif
 Patch40:        showconsole-%{SCVER}.dif
 Patch41:        showconsole-1.16-deadlock.diff
@@ -72,6 +75,10 @@ Patch42:        showconsole-1.16-glibc.dif
 Patch50:        startpar-%{START}.dif
 Requires:       mingetty
 Requires:       sysvinit-tools
+%if %{without sysvinit}
+%{expand: %%global sysdsysunitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
+%{expand: %%global sysdsysconfdir %(pkg-config systemd --variable=systemdsystemconfdir)}
+%endif
 
 %description
 System V style init programs by Miquel van Smoorenburg that control the
@@ -104,12 +111,15 @@ Group:          System/Base
 Provides:       sbin_init
 Conflicts:      otherproviders(sbin_init)
 Requires:       %{name}
+%ifnarch s390 s390x
+Requires:       powerd
+%endif
 
 %description init
 Just some symlinks and manual page for sysvinit
 
 %prep
-%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5
+%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 4 -b 5
 %patch1  -p0 -b .startstop
 %patch2  -p0 -b .suse
 %patch3  -p0 -b .scripts2
@@ -123,12 +133,7 @@ Just some symlinks and manual page for sysvinit
 %patch11 -p0 -b .dostat
 %patch
 pushd doc
-  mkdir killproc powerd showconsole
-popd
-pushd ../powerd-%{PDVER}
-%patch20
-%patch21
-ln -t../%{name}-%{SIVER}dsf/doc/powerd README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
+  mkdir killproc showconsole
 popd
 pushd ../killproc-%{KPVER}
 %patch30
@@ -158,97 +163,67 @@ popd
 pushd ../killproc-%{KPVER}
   make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" CC="%__cc"
 popd
-pushd ../powerd-%{PDVER}
-%ifnarch s390 s390x
-  %configure --prefix= --bindir='$(DESTDIR)/sbin' \
-	--mandir='$(DESTDIR)%{_mandir}' \
-	--sbindir='$(DESTDIR)/sbin'
-  make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{SIVER}dsf/src $RPM_OPT_FLAGS "
-%endif
-popd
 pushd ../startpar-%{START}
   make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" CC="%__cc"
 popd
 
 %install
-  rm -rf ${RPM_BUILD_ROOT}
-  mkdir  ${RPM_BUILD_ROOT}
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/bin
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/dev
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/etc
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/sbin
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/usr/bin
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}/usr/include
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5
-  mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-  make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT} WITH_SELINUX=yes DISTRO=SuSE
-  mv ${RPM_BUILD_ROOT}/sbin/init ${RPM_BUILD_ROOT}/sbin/sysvinit
-  mv ${RPM_BUILD_ROOT}%{_mandir}/man8/init.8 ${RPM_BUILD_ROOT}/%{_mandir}/man8/sysvinit.8
-  ln -s /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/init
-  ln -s sysvinit.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/init.8
-  mkdir -p ${RPM_BUILD_ROOT}/lib/sysvinit
-  ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/lib/sysvinit/telinit
-  ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/telinit
-  test -p     ${RPM_BUILD_ROOT}/dev/initctl || {
-    rm -f     ${RPM_BUILD_ROOT}/dev/initctl
-    mknod     ${RPM_BUILD_ROOT}/dev/initctl p
-    chmod 600 ${RPM_BUILD_ROOT}/dev/initctl
+  rm -rf %{buildroot}
+  mkdir  %{buildroot}
+  mkdir -m 755 -p %{buildroot}/bin
+  mkdir -m 755 -p %{buildroot}/dev
+  mkdir -m 755 -p %{buildroot}/etc
+  mkdir -m 755 -p %{buildroot}/sbin
+  mkdir -m 755 -p %{buildroot}/usr/bin
+  mkdir -m 755 -p %{buildroot}/usr/include
+  mkdir -m 755 -p %{buildroot}%{_mandir}/man1
+  mkdir -m 755 -p %{buildroot}%{_mandir}/man5
+  mkdir -m 755 -p %{buildroot}%{_mandir}/man8
+  make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} WITH_SELINUX=yes DISTRO=SuSE
+  mv %{buildroot}/sbin/init %{buildroot}/sbin/sysvinit
+  mv %{buildroot}%{_mandir}/man8/init.8 %{buildroot}/%{_mandir}/man8/sysvinit.8
+  ln -s /sbin/sysvinit %{buildroot}/sbin/init
+  ln -s sysvinit.8 %{buildroot}%{_mandir}/man8/init.8
+  mkdir -p %{buildroot}/lib/sysvinit
+  ln -sf /sbin/sysvinit %{buildroot}/lib/sysvinit/telinit
+  ln -sf /sbin/sysvinit %{buildroot}/sbin/telinit
+  test -p     %{buildroot}/dev/initctl || {
+    rm -f     %{buildroot}/dev/initctl
+    mknod     %{buildroot}/dev/initctl p
+    chmod 600 %{buildroot}/dev/initctl
   }
 pushd ../showconsole-%{SCVER}
-  make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0700" DESTDIR=${RPM_BUILD_ROOT}
+  make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0700" DESTDIR=%{buildroot}
 popd
 pushd ../killproc-%{KPVER}
-  make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0755" DESTDIR=${RPM_BUILD_ROOT}
-popd
-pushd ../powerd-%{PDVER}
-%ifnarch s390 s390x
-  make install DESTDIR=${RPM_BUILD_ROOT}
-  echo '# ' > ${RPM_BUILD_ROOT}/etc/powerd.conf
-  echo '# /etc/powerd.conf  for powerd version-2.02' >> ${RPM_BUILD_ROOT}/etc/powerd.conf
-  echo '# ' >> ${RPM_BUILD_ROOT}/etc/powerd.conf
-  echo '# read manual page of detectups(8) and powerd(8) its self.' >> ${RPM_BUILD_ROOT}/etc/powerd.conf
-  echo '# ' >> ${RPM_BUILD_ROOT}/etc/powerd.conf
-  mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
-  install -m 0744 %{SOURCE6} ${RPM_BUILD_ROOT}/etc/init.d/powerd
-  ln -sf /etc/init.d/powerd ${RPM_BUILD_ROOT}/sbin/rcpowerd
-%endif
+  make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0755" DESTDIR=%{buildroot}
 popd
 pushd ../startpar-%{START}
-  make install DESTDIR=${RPM_BUILD_ROOT}
+  make install DESTDIR=%{buildroot}
 popd
 #
 # Install mkinitrd scriptlets
 #
-  install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
-  install -m 0755 %{SOURCE8} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-blogd.sh
-  install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-killblogd.sh
-  install -m 0755 %{SOURCE10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-killblogd2.sh
+  install -d %{buildroot}/lib/mkinitrd/scripts
+  install -m 0755 %{SOURCE8} %{buildroot}/lib/mkinitrd/scripts/boot-blogd.sh
+  install -m 0755 %{SOURCE9} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd.sh
+  install -m 0755 %{SOURCE10} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd2.sh
 #
 # Remove files not packed:
 #
-  rm -f ${RPM_BUILD_ROOT}/usr/include/{initreq.h,libblogger.h}
-  rm -f ${RPM_BUILD_ROOT}/usr/lib/libblogger.a
-  rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mesg.1*
-%ifarch s390 s390x
-  rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/powerd.8*
-  rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/detectups.8*
-  rm -f ${RPM_BUILD_ROOT}/sbin/powerd
-  rm -f ${RPM_BUILD_ROOT}/sbin/detectups
-%endif
-  chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
+  rm -f %{buildroot}/usr/include/{initreq.h,libblogger.h}
+  rm -f %{buildroot}/usr/lib/libblogger.a
+  rm -f %{buildroot}%{_mandir}/man1/mesg.1*
+  chmod 444 %{buildroot}%{_mandir}/man?/*
 %if ! %{with util_linux}
-  rm -vf ${RPM_BUILD_ROOT}/bin/mountpoint
-  rm -vf ${RPM_BUILD_ROOT}/usr/bin/utmpdump
-  rm -vf ${RPM_BUILD_ROOT}/sbin/sulogin
-  rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/mountpoint.1*
-  rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/utmpdump.1*
-  rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man8/sulogin.8*
+  rm -vf %{buildroot}/bin/mountpoint
+  rm -vf %{buildroot}/usr/bin/utmpdump
+  rm -vf %{buildroot}/sbin/sulogin
+  rm -vf %{buildroot}%{_mandir}/man1/mountpoint.1*
+  rm -vf %{buildroot}%{_mandir}/man1/utmpdump.1*
+  rm -vf %{buildroot}%{_mandir}/man8/sulogin.8*
 %endif
 
-%preun tools
-%stop_on_removal powerd
-
 %post
 ret=0
 if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build -a -x /sbin/init; then
@@ -267,10 +242,6 @@ if test -x /sbin/mkinitrd_setup; then
 fi
 exit $ret
 
-%postun tools
-%restart_on_update powerd
-%insserv_cleanup
-
 %postun
 if test -x /sbin/mkinitrd_setup; then
     mkinitrd_setup
@@ -311,11 +282,6 @@ fi
 %defattr (-,root,root,755)
 %doc COPYING COPYRIGHT doc/Propaganda 
 %doc doc/Changelog doc/killproc doc/showconsole
-%ifnarch s390 s390x
-%config /etc/powerd.conf
-%config /etc/init.d/powerd
-%doc   doc/powerd
-%endif
 %config /etc/pam.d/init
 %if %{with util_linux}
 /sbin/sulogin
@@ -338,11 +304,6 @@ fi
 /sbin/killproc
 /sbin/killall5
 /sbin/pidof
-%ifnarch s390 s390x
-/sbin/powerd
-/sbin/detectups
-/sbin/rcpowerd
-%endif
 /sbin/startpar
 /sbin/rvmtab
 /sbin/vhangup
@@ -371,10 +332,6 @@ fi
 %doc %{_mandir}/man8/killall5.8.gz
 %doc %{_mandir}/man8/killproc.8.gz
 %doc %{_mandir}/man8/pidof.8.gz
-%ifnarch s390 s390x
-%doc %{_mandir}/man8/powerd.8.gz
-%doc %{_mandir}/man8/detectups.8.gz
-%endif
 %doc %{_mandir}/man8/startproc.8.gz
 %doc %{_mandir}/man8/start_daemon.8.gz
 %doc %{_mandir}/man8/startpar.8.gz