diff --git a/powerman-2.3.20.tar.gz b/powerman-2.3.20.tar.gz
deleted file mode 100644
index 54aaee0..0000000
--- a/powerman-2.3.20.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4b0858d1214aab18e2673596b00ac9bad976cb7b777209e10732467c3551b88
-size 620248
diff --git a/powerman-2.3.24.tar.gz b/powerman-2.3.24.tar.gz
new file mode 100644
index 0000000..016c8de
--- /dev/null
+++ b/powerman-2.3.24.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85d5d0e0aef05a1637a8efe58f436f1548d2411c98c90c1616d22ee79c19d275
+size 619601
diff --git a/powerman.changes b/powerman.changes
index 1ca95da..0eae024 100644
--- a/powerman.changes
+++ b/powerman.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Nov 13 18:40:43 UTC 2015 - mpluskal@suse.com
+
+- Update to 2.3.24
+  * Don't package /var/run/powerman; let systemd manage it 
+		[TOSS-2987]
+  * Cleanup: drop trailing whitespace
+- Changes for 2.3.23
+  * Build: silence CC lines, fix AC_LANG_CONFTEST warnings, fix 
+		$(EXEEXT) warnings.
+	*	Build: install System V init scripts if 
+		--with-systemdsystemunitdir is not configured and include both 
+		in EXTRA_DIST.
+	* Build: re-enable 'make check' unit tests.
+	* Build: fix some 'make distcheck' issues, but until unit tests 
+		are fixed to find *.exp and *.conf files in $(srcdir), this will still fail.
+	* RPM: configure genders, httppower, snmppower, and tcp-wrappers 
+		unconditionally; update URL.
+- Cleanups spec file with spec-cleaner
+- Drop powerman.service and use bundled one
+
 -------------------------------------------------------------------
 Thu Mar 12 09:45:27 UTC 2015 - p.drouand@gmail.com
 
diff --git a/powerman.service b/powerman.service
deleted file mode 100644
index 6bf993e..0000000
--- a/powerman.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Powerman Daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/powerman.pid
-ExecStart=/usr/sbin/powermand
-
-[Install]
-WantedBy=multi-user.target
diff --git a/powerman.spec b/powerman.spec
index 0db7a03..c56f598 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package powerman
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,26 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           powerman
-Version:        2.3.20
+Version:        2.3.24
 Release:        0
-Url:            https://github.com/chaos/powerman
-Source0:        https://github.com/chaos/powerman/releases/download/%{version}/%{name}-%{version}.tar.gz
-Source1:        %{name}.service
 Summary:        Centralized Power Control for Clusters
 License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
-BuildRequires:  curl-devel
+Url:            https://github.com/chaos/powerman
+Source0:        https://github.com/chaos/powerman/releases/download/%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
-BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
-#BuildRequires:  genders
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 
 %description
-PowerMan is a tool for manipulating remote power control (RPC) devices from a 
-central location. Several RPC varieties are supported natively by PowerMan and 
+PowerMan is a tool for manipulating remote power control (RPC) devices from a
+central location. Several RPC varieties are supported natively by PowerMan and
 Expect-like configurability simplifies the addition of new devices.
 
 %package -n libpowerman0
@@ -45,9 +45,9 @@ Group:          System/Libraries
 A shared library for applications using PowerMan.
 
 %package devel
-Requires:       libpowerman0 = %{version}
 Summary:        Headers and libraries for developing applications using PowerMan
 Group:          Development/Libraries/C and C++
+Requires:       libpowerman0 = %{version}
 
 %description devel
 A header file and static library for developing applications using PowerMan.
@@ -56,21 +56,18 @@ A header file and static library for developing applications using PowerMan.
 %setup -q
 
 %build
-# --with-genders
-%configure\
+%configure \
 	--disable-static\
 	--with-httppower
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf %{buildroot}%{_sysconfdir}/init.d
-install -Dm 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/powerman/powerman.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/powerman/powerman.conf
-# 
-rm -r $RPM_BUILD_ROOT%{_libdir}/stonith
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+mv %{buildroot}%{_sysconfdir}/powerman/powerman.conf.example %{buildroot}%{_sysconfdir}/powerman/powerman.conf
+rm -r %{buildroot}%{_libdir}/stonith
+%fdupes -s  %{buildroot}
 
 %pre
 %service_add_pre %{name}.service
@@ -97,7 +94,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/stonith
 %exclude %{_mandir}/man3/*.*
 %{_sbindir}/*
 %dir %{_sysconfdir}/powerman
-%{_unitdir}/%{name}.service
+%attr(0644,root,root) %{_unitdir}/%{name}.service
 %config %{_sysconfdir}/powerman/powerman.conf
 %{_sysconfdir}/powerman/*.dev