diff --git a/librepo-1.7.15-repoconf-assert.patch b/librepo-1.7.15-repoconf-assert.patch
new file mode 100644
index 0000000..f64c1fa
--- /dev/null
+++ b/librepo-1.7.15-repoconf-assert.patch
@@ -0,0 +1,15 @@
+diff -up librepo/tests/test_repoconf.c.repoconf-assert librepo/tests/test_repoconf.c
+--- librepo/tests/test_repoconf.c.repoconf-assert	2015-05-27 15:23:29.000000000 +0200
++++ librepo/tests/test_repoconf.c	2015-05-27 15:26:35.000000000 +0200
+@@ -49,9 +49,9 @@ static void
+ repoconf_assert_na(LrYumRepoConf *repoconf,
+                    LrYumRepoConfOption option)
+ {
+-    void *ptr = NULL;
++    char array[2048];
+     _cleanup_error_free_ GError *tmp_err = NULL;
+-    gboolean ret = lr_yum_repoconf_getinfo(repoconf, &tmp_err, option, &ptr);
++    gboolean ret = lr_yum_repoconf_getinfo(repoconf, &tmp_err, option, array);
+     g_assert(!ret);
+     g_assert_error(tmp_err, LR_REPOCONF_ERROR, LRE_NOTSET);
+ }
diff --git a/librepo.spec b/librepo.spec
index 32d039c..b7313e2 100644
--- a/librepo.spec
+++ b/librepo.spec
@@ -13,7 +13,7 @@
 
 Name:           librepo
 Version:        1.7.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Repodata downloading library
 
 Group:          System Environment/Libraries
@@ -24,6 +24,8 @@ URL:            https://github.com/Tojaj/librepo
 #  cd librepo
 #  utils/make_tarball.sh %{gitrev}
 Source0:        librepo-%{gitrev}.tar.xz
+# https://github.com/Tojaj/librepo/commit/7f684757ba803641defad6c3cf5e2044912620cd
+Patch0:         librepo-1.7.15-repoconf-assert.patch
 
 BuildRequires:  check-devel
 BuildRequires:  cmake
@@ -88,6 +90,7 @@ Python 3 bindings for the librepo library.
 
 %prep
 %setup -q -n librepo
+%patch0 -p1 -b .repoconf-assert
 
 %if %{with python3}
 rm -rf py3
@@ -148,7 +151,10 @@ popd
 %endif
 
 %changelog
-* Tue Jun 12 2015 Colin Walters <walters@redhat.com> - 1.7.15-2
+* Wed May 27 2015 Dan Horák <dan[at]danny.cz> - 1.7.15-3
+- fix segfault in repoconf_assert_na (RhBug: 1222471)
+
+* Tue May 12 2015 Colin Walters <walters@redhat.com> - 1.7.15-2
 - Disable tests and drop python-flask build dependency on RHEL7, as
   it is not in the core