diff --git a/qpkg/TODO b/qpkg/TODO
index f3cf69f..a6c1c99 100644
--- a/qpkg/TODO
+++ b/qpkg/TODO
@@ -21,6 +21,8 @@ Still left to do
 
   Update: added detection of cyclic dependencies (in progress)
 
+  Update: added test for QPKG_ADDING cleanup bug
+
 - implement keyword search
 
 - consider also supporting the similar but not identical (parent ?) format
diff --git a/qpkg/test/bug-adding b/qpkg/test/bug-adding
new file mode 100755
index 0000000..995003c
--- /dev/null
+++ b/qpkg/test/bug-adding
@@ -0,0 +1,44 @@
+#!/bin/sh
+. ./Common
+
+###############################################################################
+
+#
+# See the comment at the end of "resolve" in prereq.c for details.
+#
+
+qpkg_fail "BUG: we don't clean up QPKG_ADDING, yielding false errors" \
+  prereq A <<EOF
+Package: D
+Version: 0
+Architecture: test
+Conflicts: B (= 1)
+Filename: D_0
+
+Package: C
+Version: 0
+Architecture: test
+Depends: D
+Filename: C_0
+
+Package: B
+Version: 1
+Architecture: test
+Depends: C
+Filename: B_1
+
+Package: B
+Version: 0
+Architecture: test
+Depends: C
+Filename: B_0
+
+Package: A
+Version: 0
+Architecture: test
+Depends: B
+Filename: A_0
+EOF
+expect <<EOF
+package C version 0 has cyclic dependency
+EOF