diff --git a/powerman-2.3.5.tar.bz2 b/powerman-2.3.5.tar.bz2
deleted file mode 100644
index 3945d28..0000000
--- a/powerman-2.3.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4caa03e925ed086c5c9886c0335e0646cb099e65ba213a43d34ec04432fd5d7a
-size 410179
diff --git a/powerman-2.3.9.tar.bz2 b/powerman-2.3.9.tar.bz2
new file mode 100644
index 0000000..affb2cd
--- /dev/null
+++ b/powerman-2.3.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8893d0d88bf798a512d714dcfca5dd377f8cf5426d1da6fbeb5b2593e204ef28
+size 509062
diff --git a/powerman-piddir.patch b/powerman-piddir.patch
index e27070b..b9abb1d 100644
--- a/powerman-piddir.patch
+++ b/powerman-piddir.patch
@@ -1,5 +1,5 @@
---- scripts/powerman.init.in
-+++ scripts/powerman.init.in
+--- scripts/powerman.in
++++ scripts/powerman.in
 @@ -34,7 +34,8 @@
  DAEMON="$sbindir/powermand"
  #DAEMON_ARGS=
diff --git a/powerman-runlevel.patch b/powerman-runlevel.patch
new file mode 100644
index 0000000..aebd182
--- /dev/null
+++ b/powerman-runlevel.patch
@@ -0,0 +1,13 @@
+Index: powerman-2.3.9/scripts/powerman.in
+===================================================================
+--- powerman-2.3.9.orig/scripts/powerman.in
++++ powerman-2.3.9/scripts/powerman.in
+@@ -16,7 +16,7 @@
+ # Required-Stop:      $local_fs $named $network
+ # Should-Start:       $remote_fs $syslog $time
+ # Should-Stop:        $remote_fs $syslog $time
+-# Default-Start:      2 3 4 5
++# Default-Start:      2 3 5
+ # Default-Stop:       0 1 6
+ # Short-Description:  Start/Stop the PowerMan (remote power manager) daemon.
+ ### END INIT INFO
diff --git a/powerman.changes b/powerman.changes
index a62f53d..d402a21 100644
--- a/powerman.changes
+++ b/powerman.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jul 28 19:29:35 CEST 2011 - sbrabec@suse.cz
+
+- Update to version 2.3.9:
+  * Add MIB support to snmppower.
+  * Add eaton-epdu-blue-switched.dev.
+  * Add support for SNMP power controllers.
+  * Add SNMP dev files for 8-port APC, 8-port Baytech, and 20 port
+    Eaton Revelation PDU.
+  * Add support for APC 7900 revision 3 firmware.
+  * Add support for Appro Greenblade.
+  * Add support for APC 7920.
+  * Add Support for ranged beacon on/off device scripts, and beacon
+    support for ipmipower.
+- Make heartbeat support optional as it is dropped now.
+
 -------------------------------------------------------------------
 Wed May 19 02:38:24 CEST 2010 - ro@suse.de
 
diff --git a/powerman.spec b/powerman.spec
index ffecda2..e47be33 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -15,21 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
+%if 0%{?suse_version} <= 1140
+%if 0%{?suse_version} > 1110
+%define enable_heartbeat 1
+%endif
+%endif
 Name:           powerman
-Version:        2.3.5
-Release:        4
+Version:        2.3.9
+Release:        0
 License:        GPL
 Group:          Productivity/Clustering/HA
 Url:            http://powerman.sourceforge.net/
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         powerman-piddir.patch
+Patch1:         powerman-runlevel.patch
 Summary:        Centralized Power Control for Clusters
 BuildRequires:  curl-devel ncurses-devel pkg-config tcpd-devel
-# For directory ownership:
+%if 0%{?enable_heartbeat}
 BuildRequires:  heartbeat
+%endif
 #BuildRequires:  genders
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq
@@ -39,14 +43,6 @@ 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.
 
-
-
-Authors:
---------
-    Andrew Uselton
-    Jim Garlick <garlick.jim@gmail.com>
-    Al Chu <chu11@llnl.gov>
-
 %package -n libpowerman0
 Summary:        Libraries for applications using PowerMan
 Group:          System/Libraries
@@ -55,14 +51,6 @@ License:        GPL
 %description -n libpowerman0
 A shared library for applications using PowerMan.
 
-
-
-Authors:
---------
-    Andrew Uselton
-    Jim Garlick <garlick.jim@gmail.com>
-    Al Chu <chu11@llnl.gov>
-
 %package devel
 Requires:       libpowerman0 = %{version}
 Summary:        Headers and libraries for developing applications using PowerMan
@@ -72,17 +60,10 @@ License:        GPL
 %description devel
 A header file and static library for developing applications using PowerMan.
 
-
-
-Authors:
---------
-    Andrew Uselton
-    Jim Garlick <garlick.jim@gmail.com>
-    Al Chu <chu11@llnl.gov>
-
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 
 %build
 # --with-genders
@@ -96,6 +77,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 ln -s ../..%{_sysconfdir}/init.d/powerman $RPM_BUILD_ROOT%{_sbindir}/rcpowerman
 mv $RPM_BUILD_ROOT%{_sysconfdir}/powerman/powerman.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/powerman/powerman.conf
+# 
+%if ! 0%{?enable_heartbeat}
+rm -r $RPM_BUILD_ROOT%{_libdir}/stonith
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -116,9 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog ChangeLog-1.0 DISCLAIMER COPYING NEWS README TODO
+%doc AUTHORS DISCLAIMER COPYING NEWS README TODO
 %{_bindir}/*
+%if 0%{?enable_heartbeat}
 %{_libdir}/stonith/plugins/external/powerman
+%endif
 %dir %attr(0755,daemon,root) %ghost %{_localstatedir}/run/powerman
 %doc %{_mandir}/man?/*.*
 %exclude %doc %{_mandir}/man3/*.*