diff --git a/0023-doc-actualize-the-abrt-bodhi-man-page.patch b/0023-doc-actualize-the-abrt-bodhi-man-page.patch
new file mode 100644
index 0000000..34ec666
--- /dev/null
+++ b/0023-doc-actualize-the-abrt-bodhi-man-page.patch
@@ -0,0 +1,41 @@
+From e47863d42f78ddcd404561e21c4c75e6d2feb99e Mon Sep 17 00:00:00 2001
+From: Matej Habrnal <mhabrnal@redhat.com>
+Date: Wed, 2 Sep 2015 12:29:31 +0200
+Subject: [PATCH] doc: actualize the abrt-bodhi man page
+
+Parameters -d and -u were not in the man page.
+
+Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
+---
+ doc/abrt-bodhi.txt | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/doc/abrt-bodhi.txt b/doc/abrt-bodhi.txt
+index 945a4a9..fe790d6 100644
+--- a/doc/abrt-bodhi.txt
++++ b/doc/abrt-bodhi.txt
+@@ -7,7 +7,7 @@ abrt-bodhi - The ABRT bodhi client.
+ 
+ SYNOPSIS
+ --------
+-'abrt-bodhi' [-v] [-r[RELEASE]] (-b ID1[,ID2,...] | PKG-NAME) [PKG-NAME]...
++'abrt-bodhi' [-v] [-r[RELEASE]] [-u URL] [-d DIR] (-b ID1[,ID2,...] | PKG-NAME) [PKG-NAME]...
+ 
+ DESCRIPTION
+ -----------
+@@ -25,6 +25,12 @@ OPTIONS
+ -b, --bugs ID1,ID2,..
+     Specify any number of Bugzilla IDs (--bugs=1234,5678)
+ 
++-d, --problem-dir DIR::
++    Path to problem directory
++
++-u, --url URL::
++    Specify a bodhi server url
++
+ AUTHORS
+ -------
+ * ABRT team
+-- 
+2.5.0
+
diff --git a/0024-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch b/0024-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch
new file mode 100644
index 0000000..3c0b7e2
--- /dev/null
+++ b/0024-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch
@@ -0,0 +1,29 @@
+From 66a27fb723e0930d30ea319484817b3f5ee364dc Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Mon, 7 Sep 2015 10:23:30 +0200
+Subject: [PATCH] bodhi: fix a segfault when testing an os-release opt for
+ 'rawhide'
+
+Resolves: rhbz#1260259
+
+Signed-off-by: Jakub Filak <jfilak@redhat.com>
+---
+ src/plugins/bodhi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c
+index b348a26..bbd88f7 100644
+--- a/src/plugins/bodhi.c
++++ b/src/plugins/bodhi.c
+@@ -513,7 +513,7 @@ int main(int argc, char **argv)
+             parse_osinfo_for_rhts(osinfo, &product, &version);
+ 
+             /* There are no bodhi updates for Rawhide */
+-            bool rawhide = strcasecmp(release, "rawhide") == 0;
++            bool rawhide = strcasecmp(version, "rawhide") == 0;
+             if (!rawhide)
+                 query = strbuf_append_strf(query, "releases=f%s&", version);
+ 
+-- 
+2.5.0
+
diff --git a/abrt.spec b/abrt.spec
index e65e8d8..113904b 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -49,7 +49,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 2.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://abrt.readthedocs.org/
@@ -81,6 +81,8 @@ Patch0018: 0018-introduce-bodhi2-to-abrt-bodhi.patch
 Patch0020: 0020-ccpp-do-not-break-the-reporting-if-a-bodhi-fails.patch
 Patch0021: 0021-bodhi-add-ignoring-of-Rawhide.patch
 Patch0022: 0022-bodhi-add-parsing-of-error-responses.patch
+Patch0023: 0023-doc-actualize-the-abrt-bodhi-man-page.patch
+Patch0024: 0024-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch
 
 # '%%autosetup -S git' -> git
 BuildRequires: git
@@ -1069,6 +1071,10 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Thu Sep 17 2015 Matej Habrnal <mhabrnal@redhat.com> 2.6.1-5
+- doc: actualize the abrt-bodhi man page
+- bodhi: fix a segfault when testing an os-release opt for 'rawhide'
+
 * Thu Aug 27 2015 Matej Habrnal <mhabrnal@redhat.com> 2.6.1-4
 - bodhi: add parsing of error responses
 - bodhi: add ignoring of Rawhide