diff --git a/0001-testcase-replace-i-with-repoid.patch b/0001-testcase-replace-i-with-repoid.patch
new file mode 100644
index 0000000..a279275
--- /dev/null
+++ b/0001-testcase-replace-i-with-repoid.patch
@@ -0,0 +1,39 @@
+From e7e1881574996abed4ac46eac3ebb504004eb29a Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sun, 31 Jul 2016 18:54:33 +0200
+Subject: [PATCH] testcase: replace i with repoid
+
+looks like it was typo.
+
+Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1361831
+Closes: https://github.com/openSUSE/libsolv/issues/150
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ ext/testcase.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/testcase.c b/ext/testcase.c
+index 52c139f..5749dfa 100644
+--- a/ext/testcase.c
++++ b/ext/testcase.c
+@@ -2328,7 +2328,7 @@ testcase_write(Solver *solv, const char *dir, int resultflags, const char *testc
+       Repo *repo = pool_id2repo(pool, repoid);
+       char *buf = solv_malloc((repo->name ? strlen(repo->name) : 0) + 40);
+       char *mp;
+-      orignames[i] = repo->name;
++      orignames[repoid] = repo->name;
+       if (!repo->name || !repo->name[0])
+         sprintf(buf, "#%d", repoid);
+       else
+@@ -2353,7 +2353,7 @@ testcase_write(Solver *solv, const char *dir, int resultflags, const char *testc
+     {
+       Repo *repo = pool_id2repo(pool, repoid);
+       solv_free((void *)repo->name);
+-      repo->name = orignames[i];
++      repo->name = orignames[repoid];
+     }
+   solv_free(orignames);
+   return r;
+-- 
+2.7.4
+
diff --git a/libsolv.spec b/libsolv.spec
index 766b881..568fe6a 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -53,13 +53,15 @@
 
 Name:           lib%{libname}
 Version:        0.6.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Package dependency solver
 
 License:        BSD
 URL:            https://github.com/openSUSE/libsolv
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
+Patch0001:      0001-testcase-replace-i-with-repoid.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(rpm)
@@ -307,6 +309,9 @@ popd
 %endif
 
 %changelog
+* Wed Aug 03 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.6.23-2
+- Backport patch to fix dnf --debugsolver crash (RHBZ #1361831)
+
 * Wed Jul 27 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.6.23-1
 - Update to 0.6.23