diff --git a/SOURCES/psmisc-22.20-insufficient-path-len-in-mntinfo.patch b/SOURCES/psmisc-22.20-insufficient-path-len-in-mntinfo.patch
new file mode 100644
index 0000000..b8e2b28
--- /dev/null
+++ b/SOURCES/psmisc-22.20-insufficient-path-len-in-mntinfo.patch
@@ -0,0 +1,12 @@
+diff -Naur psmisc-22.20.orig/src/fuser.c psmisc-22.20/src/fuser.c
+--- psmisc-22.20.orig/src/fuser.c	2012-09-19 12:54:03.000000000 +0200
++++ psmisc-22.20/src/fuser.c	2015-07-31 19:55:14.000000000 +0200
+@@ -1900,7 +1900,7 @@
+ 
+ static void init_mntinfo(void)
+ {
+-	char mpoint[PATH_MAX + 1];
++	char mpoint[PATH_MAX*4 + 1]; // octal escaping takes 4 chars per 1 char
+ 	int mid, parid, max = 0;
+ 	uint maj, min;
+ 	list_t sort;
diff --git a/SOURCES/psmisc-22.20-prtstat-man-duplicate-options.patch b/SOURCES/psmisc-22.20-prtstat-man-duplicate-options.patch
new file mode 100644
index 0000000..ad6492b
--- /dev/null
+++ b/SOURCES/psmisc-22.20-prtstat-man-duplicate-options.patch
@@ -0,0 +1,18 @@
+diff -Naur psmisc-22.20.orig/doc/prtstat.1 psmisc-22.20/doc/prtstat.1
+--- psmisc-22.20.orig/doc/prtstat.1	2012-09-19 12:54:03.000000000 +0200
++++ psmisc-22.20/doc/prtstat.1	2015-09-24 13:28:19.804000000 +0200
+@@ -32,14 +32,6 @@
+ .BR \-V , \ \-\-version
+ Show the version information for
+ .BR prtstat .
+-.SH OPTIONS
+-.TP
+-.BR \-r , \ \-\-raw
+-Print the information in raw format.
+-.TP
+-.BR \-V , \ \-\-version
+-Show the version information for
+-.BR prtstat .
+ .SH FILES
+ .TP
+ /proc/<PID>/stat
diff --git a/SPECS/psmisc.spec b/SPECS/psmisc.spec
index 40ab6c3..0c35f77 100644
--- a/SPECS/psmisc.spec
+++ b/SPECS/psmisc.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 22.20
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sourceforge.net/projects/psmisc
@@ -19,6 +19,8 @@ Patch3: psmisc-22.20-RH-man-page-scan.patch
 Patch4: pstree-introduce-support-for-namespaces.patch
 Patch5: pstree-introduce-namespace-transition-information.patch
 Patch6: psmisc-22.20-null-ptr-dereference.patch
+Patch7: psmisc-22.20-insufficient-path-len-in-mntinfo.patch
+Patch8: psmisc-22.20-prtstat-man-duplicate-options.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -42,6 +44,8 @@ of processes that are using specified files or filesystems.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -72,6 +76,14 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 %doc AUTHORS ChangeLog COPYING README
 
 %changelog
+* Tue May 24 2016 Jan Rybar <jrybar@redhat.com> 22.20-11
+- Fixing duplication of text in prtstat man page
+- Resolves: rhbz#1265243
+
+* Mon May 16 2016 Jan Rybar <jrybar@redhat.com> 22.20-10
+- Fixing segfault caused by insufficient length for mounting point path
+- Resolves: rhbz#1078887
+
 * Sat Aug  2 2014 Peter Robinson <pbrobinson@redhat.com> 22.20-9
 - Update ppc64 to power64 macro
 - Resolves: rhbz#1125653