diff --git a/powerpc-utils-1.3.8-man.patch b/powerpc-utils-1.3.8-man.patch
new file mode 100644
index 0000000..a2279b4
--- /dev/null
+++ b/powerpc-utils-1.3.8-man.patch
@@ -0,0 +1,244 @@
+diff -up powerpc-utils-1.2.15/man/lsdevinfo.8.man powerpc-utils-1.2.15/man/lsdevinfo.8
+--- powerpc-utils-1.2.15/man/lsdevinfo.8.man	2013-01-16 15:31:13.886591137 +0100
++++ powerpc-utils-1.2.15/man/lsdevinfo.8	2013-01-16 15:31:13.886591137 +0100
+@@ -0,0 +1,39 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
++.TH LSDEVINFO "8" "October 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++lsdevinfo - information on Virtual devices
++
++.SH SYNOPSIS
++.B lsdevinfo
++[\fI-q criteria\fR] [\fI-F format\fR] [\fI-R\fR] [\fI-c\fR] [\fI-h\fR]
++
++.SH DESCRIPTION
++Provide information on Virtual devices
++.PP
++
++.SH OPTIONS
++.TP
++\fB\-q\fR criteria
++Specifies a criteria to select which devices are to be displayed.
++.TP
++\fB\-F\fR format
++Specifies the set of attributes to be displayed.
++.TP
++\fB\-R\fR
++Recursively display children of selected devices
++.TP
++\fB\-c\fR
++Display output as a comma separated list for each device.
++.TP
++\fB\-V\fR
++Display version information and exit
++.TP
++\fB\-h\fR
++Display help information and exit
++
++.SH AUTHOR
++.B lsdevinfo
++was written by Santiago Leon <sleon@ec.ibm.com>.
++.PP
++This manual page was written by Roman Rakus <rrakus@redhat.com>.
++
+diff -up powerpc-utils-1.2.15/man/lsprop.8.man powerpc-utils-1.2.15/man/lsprop.8
+--- powerpc-utils-1.2.15/man/lsprop.8.man	2013-01-16 15:31:13.886591137 +0100
++++ powerpc-utils-1.2.15/man/lsprop.8	2013-01-16 15:31:13.886591137 +0100
+@@ -0,0 +1,42 @@
++.TH LSPROP "8" "Sep 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++lsprop \- list properties
++.SH SYNOPSIS
++.B lsprop
++.RB [ \-R ]
++.RB [ \-m
++.IR max-bytes ]
++.RB [ \-w
++.IR num-words ]
++.RI [ FILE .\|.\|.]
++.SH OVERVIEW
++.B lsprop
++program is a member of the ppc64-utils suite of utils.
++Use it to list properties
++
++.SH DESCRIPTION
++.B lsprop
++displays properties for
++.IR FILE s
++like Open Firmware
++.I .properties
++word.
++If the
++.I FILE
++is not set, the current directory is used.
++
++.SH OPTIONS
++.TP
++.B \-R
++Process recursively
++.TP
++.BI \-m " max-bytes"
++Read only first
++.I max-bytes
++bytes from the
++.IR FILE s
++.TP
++.BI \-w " num-words"
++Display up to
++.I num-words
++words per line
+diff -up powerpc-utils-1.2.15/man/ls-vdev.8.man powerpc-utils-1.2.15/man/ls-vdev.8
+--- powerpc-utils-1.2.15/man/ls-vdev.8.man	2013-01-16 15:31:13.886591137 +0100
++++ powerpc-utils-1.2.15/man/ls-vdev.8	2013-01-16 15:31:13.886591137 +0100
+@@ -0,0 +1,25 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
++.TH LS-VDEV "8" "October 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++ls-vdev \- information on Virtual SCSI adapters and devices
++.SH SYNOPSIS
++.BR ls-vdev " [" \-h " | " -V ]
++
++.SH DESCRIPTION
++Provide information on Virtual SCSI adapters and devices
++.PP
++
++.SH OPTIONS
++.TP
++\fB\-V\fR
++Display version information and exit
++.TP
++\fB\-h\fR
++Display help information and exit
++.PP
++
++.SH AUTHOR
++.B ls-vdev
++was written by Brian King <brking@linux.vnet.ibm.com>.
++.PP
++This manual page was written by Roman Rakus <rrakus@redhat.com>.
+diff -up powerpc-utils-1.2.15/man/ls-veth.8.man powerpc-utils-1.2.15/man/ls-veth.8
+--- powerpc-utils-1.2.15/man/ls-veth.8.man	2013-01-16 15:31:13.887591102 +0100
++++ powerpc-utils-1.2.15/man/ls-veth.8	2013-01-16 15:31:13.887591102 +0100
+@@ -0,0 +1,25 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
++.TH LS-VETH "8" "October 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++ls-veth \- information on Virtual Ethernet devices
++.SH SYNOPSIS
++.BR ls-veth " [" \-h " | " -V ]
++
++.SH DESCRIPTION
++Provide information on Virtual Ethernet devices
++.PP
++
++.SH OPTIONS
++.TP
++\fB\-V\fR
++Display version information and exit
++.TP
++\fB\-h\fR
++Display help information and exit
++.PP
++
++.SH AUTHOR
++.B ls-veth
++was written by Brian King <brking@linux.vnet.ibm.com>.
++.PP
++This manual page was written by Roman Rakus <rrakus@redhat.com>.
+diff -up powerpc-utils-1.2.15/man/ls-vscsi.8.man powerpc-utils-1.2.15/man/ls-vscsi.8
+--- powerpc-utils-1.2.15/man/ls-vscsi.8.man	2013-01-16 15:31:13.887591102 +0100
++++ powerpc-utils-1.2.15/man/ls-vscsi.8	2013-01-16 15:31:13.887591102 +0100
+@@ -0,0 +1,25 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
++.TH LS-VSCSI "8" "October 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++ls-vscsi \- information on Virtual devices
++.SH SYNOPSIS
++.BR ls-vscsi " [" \-h " | " -V ]
++
++.SH DESCRIPTION
++Provide information on Virtual devices
++.PP
++
++.SH OPTIONS
++.TP
++\fB\-V\fR
++Display version information and exit
++.TP
++\fB\-h\fR
++Display help information and exit
++.PP
++
++.SH AUTHOR
++.B ls-vscsi
++was written by Brian King <brking@linux.vnet.ibm.com>.
++.PP
++This manual page was written by Roman Rakus <rrakus@redhat.com>.
+diff -up powerpc-utils-1.2.15/man/nvsetenv.8.man powerpc-utils-1.2.15/man/nvsetenv.8
+--- powerpc-utils-1.2.15/man/nvsetenv.8.man	2013-01-16 15:31:13.887591102 +0100
++++ powerpc-utils-1.2.15/man/nvsetenv.8	2013-01-16 15:31:13.887591102 +0100
+@@ -0,0 +1,29 @@
++.TH NVSETENV "8" "Oct 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++nvsetenv \- wrapper to invoke nvram
++
++.SH SYNOPSIS
++.B nvsetenv
++[ ARG1 ] [ ARG2 ]
++
++.SH DESCRIPTION
++.B nvsetenv
++is just a wrapper to invoke nvram
++
++.SH OPTIONS
++
++Without any argument, nvsetenv calls
++.I nvram --print-config
++
++With one argument
++.IR ARG1 ,
++nvsetenv calls
++.I nvram --print-config=ARG1
++
++With two arguments
++.IR "ARG1 ARG2" ,
++nvsetenv calls
++.I nvram --update-config ARG1=ARG2
++
++.SH "SEE ALSO"
++.IR nvram (8)
+diff -up powerpc-utils-1.2.15/man/rtas_event_decode.8.man powerpc-utils-1.2.15/man/rtas_event_decode.8
+--- powerpc-utils-1.2.15/man/rtas_event_decode.8.man	2013-01-16 15:31:13.888591067 +0100
++++ powerpc-utils-1.2.15/man/rtas_event_decode.8	2013-01-16 15:31:13.888591067 +0100
+@@ -0,0 +1,31 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
++.TH RTAS_EVENT_DECODE 8 "September 2010" "Linux" "Linux on Power Service Tools"
++.SH NAME
++\fBrtas_event_decode\fP - RTAS message decoder
++.SH SYNOPSIS
++.B rtas_event_decode
++[\fI-dv\fR] [\fI-n eventnum\fR] [\fI-w width\fR]
++.SH DESCRIPTION
++RTAS messages are placed in the syslog encoded in a binary
++format, and are unreadable.  This tool will take exactly one
++message, parse it, and spit out the human-readable equivalent.
++This program expects ascii data on stdin.
++
++This tool is mostly meant to be used in conjuction with the
++rtas_dump shell script, which provides a suitable user 
++interface.
++
++.SH OPTIONS
++.TP
++.B \-d
++dump the raw RTAS event
++.TP
++.BI \-n " eventnum"
++event number of the RTAS event being dumped
++.TP
++.B \-v
++verbose, print all details, not just header
++.TP
++.BI \-w " width"
++limit the output to the specified width, default width is 80 characters. The width must be > 0 and < 1024.
++
diff --git a/powerpc-utils.spec b/powerpc-utils.spec
index 1ec095a..9b780e7 100644
--- a/powerpc-utils.spec
+++ b/powerpc-utils.spec
@@ -1,3 +1,5 @@
+%bcond_with systemd
+
 Name:           powerpc-utils
 Version:        1.3.8
 Release:        1%{?dist}
@@ -29,11 +31,12 @@ Requires(post):         systemd
 Requires(preun):        systemd
 Requires(postun):       systemd
 
-Patch1:         powerpc-utils-1.3.8-makefile.patch
-Patch2:         powerpc-utils-1.3.5-pseries_platform-man.patch
-Patch3:         powerpc-utils-1.3.5-update_flash_nv.patch
-Patch4:         powerpc-utils-1.3.8-install-man.patch
-Patch5:         powerpc-utils-manpage-lparstat.patch
+Patch1:         powerpc-utils-1.3.8-man.patch
+Patch2:         powerpc-utils-1.3.8-makefile.patch
+Patch3:         powerpc-utils-1.3.5-pseries_platform-man.patch
+Patch4:         powerpc-utils-1.3.5-update_flash_nv.patch
+Patch5:         powerpc-utils-1.3.8-install-man.patch
+Patch6:         powerpc-utils-manpage-lparstat.patch
 
 %description
 Utilities for PowerPC platforms.
@@ -67,7 +70,7 @@ Utilities needed when installing Fedora on PowerPC systems.
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 ./autogen.sh
-%configure --with-systemd=$RPM_BUILD_ROOT%{_unitdir}
+%configure %{?_with_systemd} --disable-werror
 make %{?_smp_mflags}
 
 
@@ -97,18 +100,43 @@ ln -s serv_config.8 %{buildroot}%{_mandir}/man8/uspchrp.8
 rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 
 %post
-%systemd_post smt_off.service
+%if %{with systemd}
+systemctl daemon-reload
+systemctl start hcn-init.service
+systemctl enable hcn-init.service
+# update the smt.state file with current SMT
+/usr/sbin/smtstate --save
+%endif
+
  
 %preun
-%systemd_preun smt_off.service
+%if %{with systemd}
+svc=$(systemctl list-units -la | grep -Fq smtstate.service; echo $?)
+if [ "$svc" = "0" ]; then
+    systemctl stop smtstate.service
+    systemctl disable smtstate.service
+fi
+if systemctl is-enabled hcn-init.service |grep -q "enabled"; then
+        systemctl stop hcn-init.service
+        systemctl disable hcn-init.service
+fi
+%endif
 
 %postun
-%systemd_postun_with_restart smt_off.service
-
+%if %{with systemd}
+systemctl daemon-reload
+%endif
 
 %files
 %attr(644, -, -) %doc README Changelog
-%attr(644, -, -) %{_unitdir}/smt_off.service
+%if %{with systemd}
+/usr/sbin/smtstate
+/var/lib/powerpc-utils/smt.state
+/lib/systemd/system/smtstate.service
+/lib/systemd/system/smt_off.service
+/lib/systemd/system/hcn-init.service
+/usr/share/man/man8/smtstate.8.gz
+%endif
 %{_bindir}/amsstat
 %{_sbindir}/activate_firmware
 %{_sbindir}/bootlist
@@ -134,6 +162,13 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 %{_sbindir}/update_flash
 %{_sbindir}/update_flash_nv
 %{_sbindir}/uspchrp
+%{_sbindir}/hcncfgdrc
+%{_sbindir}/hcnmgr
+%{_sbindir}/hcnqrydev
+%{_sbindir}/hcnrmdev
+%{_sbindir}/hcnrmhcn
+%{_sbindir}/hcnversion
+%{_sbindir}/vcpustat
 
 %{_mandir}/man1/amsstat.1*
 %{_mandir}/man5/lparcfg.5*
@@ -162,6 +197,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 %{_mandir}/man8/pseries_platform.8*
 %{_mandir}/man8/update_flash_nv.8*
 %{_mandir}/man8/uspchrp.8*
+%{_mandir}/man8/vcpustat.8*
 
 %files core
 %license COPYING