diff --git a/pegasus-2.14.1-cimconfig-man-page-fixes.patch b/pegasus-2.14.1-cimconfig-man-page-fixes.patch
new file mode 100644
index 0000000..2617d07
--- /dev/null
+++ b/pegasus-2.14.1-cimconfig-man-page-fixes.patch
@@ -0,0 +1,46 @@
+diff -up pegasus/rpm/manLinux/man8.Z/cimconfig.8.orig pegasus/rpm/manLinux/man8.Z/cimconfig.8
+--- pegasus/rpm/manLinux/man8.Z/cimconfig.8.orig	2015-09-17 14:29:03.519331559 +0200
++++ pegasus/rpm/manLinux/man8.Z/cimconfig.8	2015-09-17 15:02:37.993855252 +0200
+@@ -211,7 +211,7 @@ configuration.
+ .PP 
+ .B fullyQualifiedHostName
+ .IP 
+-.BR Description: "  Can be used to override the local system supplied
++.BR Description: " Can be used to override the local system supplied
+ fully qualified hostname (with domain) the CIM Server is using to build objects.
+ If not set, querying this configuration option will report the system
+ supplied fully qualified hostname and behavior is not changed.
+@@ -220,7 +220,8 @@ value will force the server to assume th
+ name with domain. Setting this allows the administrator to set the name that
+ indication operations and the CIM_ObjectManager assume for SystemName returned
+ as instance and key properties.
+-.IP In common setups it is not recommended to explicitly set this value.
++.IP
++In common setups it is not recommended to explicitly set this value.
+ Some scenarios scenarios in which changing the default value makes sense include:
+ .IP
+ - The case where what the CIM Server shall return to clients for host name
+@@ -516,6 +517,23 @@ by the pegasus webserver.
+ .BR Dynamic: \0No
+ .PD
+ .PP
++.B httpSessionTimeout
++.IP
++.BR Description: " If set to a positive integer, this value specifies a HTTP session lifetime
++in seconds. After initial authentication using standard HTTP mechanisms (HTTP Basic or Negotiate
++authentication), the server generates a cookie and sends it back to the client, as described in
++RFC 6265. The client can then use the cookie in subsequent requests to skip the usual HTTP
++authentication. The cookie is valid only for period of time specified by this configuration option.
++If set to zero, session management is turned off and CIM server will not issue cookies.
++This option is available only when Pegasus was compiled with PEGASUS_ENABLE_SESSION_COOKIES set
++to 'true'.
++.PD 0
++.IP
++.BR "Default Value: " 0
++.IP
++.BR Dynamic: \0Yes
++.PD
++.PP
+ 
+ 
+ If both the 
diff --git a/repupgrade.1.gz b/repupgrade.1.gz
new file mode 100644
index 0000000..dece1e3
Binary files /dev/null and b/repupgrade.1.gz differ
diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index 265368f..cf337b0 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -8,7 +8,7 @@
 
 Name:           tog-pegasus
 Version:        %{major_ver}.1
-Release:        31%{?dist}
+Release:        32%{?dist}
 Epoch:          2
 Summary:        OpenPegasus WBEM Services for Linux
 
@@ -37,6 +37,8 @@ Source9:        cim_schema_2.38.0Experimental-MOFs.zip
 Source10:       generate-certs
 # 11: Configuration file for snmp tests in -test rpm
 Source11:       snmptrapd.conf
+# 12: repupgrade man page based on pegasus/src/Clients/repupgrade/doc/repupgrade.html
+Source12:       repupgrade.1.gz
 
 #  1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011
 #     Removing insecure -rpath
@@ -86,6 +88,8 @@ Patch35:        pegasus-2.14.1-ssl-include.patch
 Patch36:        pegasus-2.14.1-snmpv3-trap.patch
 # 37: fixes setupSDK in -devel
 Patch37:        pegasus-2.14.1-fix-setup-sdk.patch
+# 38: cimconfig man page fixes
+Patch38:        pegasus-2.14.1-cimconfig-man-page-fixes.patch
 
 BuildRequires:  procps, libstdc++, pam-devel
 BuildRequires:  openssl, openssl-devel
@@ -234,6 +238,7 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
 %patch35 -p1 -b .ssl-include
 %patch36 -p1 -b .snmpv3-trap
 %patch37 -p1 -b .fix-setup-sdk
+%patch38 -p1 -b .cimconfig-man-page-fixes
 
 
 %build
@@ -332,6 +337,10 @@ install -p Schemas/CIM238/DMTF/Core/CIM_AbstractComponent.mof $RPM_BUILD_ROOT/us
 # create certificate revocation list dir (see bz#1032046)
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/Pegasus/crl
 
+# install man page
+mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1/
+cp %SOURCE12 ${RPM_BUILD_ROOT}/%{_mandir}/man1/
+
 %check
 # run unit tests
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/usr/%{_lib}
@@ -521,6 +530,9 @@ fi
 
 
 %changelog
+* Mon Sep 21 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-32
+- Add manpage for repupgrade, fixes in cimconfig manapage
+
 * Tue Sep 15 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-31
 - Add missing dependency for -test subpackage
 - Fix enumerating instances of PG_SSLCertificateRevocationList returns error