diff --git a/gdb.changes b/gdb.changes
index f49c5ad..8a03bb0 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Dec 13 10:39:19 UTC 2022 - Tom de Vries <tdevries@suse.com>
+
+- Maintenance script qa.sh:
+  * Re-enable PR26284 kfails.
+  * Remove mention of PR28275.
+  * Add PR29897 kfail.
+- Mention CVE-2018-7208 and CVE-2017-16829.
+
 -------------------------------------------------------------------
 Tue Dec 13 09:52:56 UTC 2022 - Tom de Vries <tdevries@suse.com>
 
@@ -2069,7 +2078,7 @@ Wed Nov  7 15:04:28 UTC 2018 - tdevries@suse.com
 Tue Sep 11 15:01:59 UTC 2018 - matz@suse.com
 
 - Rebase to 8.2 release (as in fedora 29 @ c720d998):
-  * Contains fix for bnc#1081527.
+  * Contains fix for bnc#1081527, CVE-2018-7208.
   * 'symbol-file' and 'add-symbol-file' accept -o to add relative
     offset to all sections
   * pager accepts 'c' response to disable it for rest of command
@@ -2128,7 +2137,7 @@ Tue Mar 27 14:01:27 UTC 2018 - matz@suse.com
 Fri Mar  9 16:27:10 UTC 2018 - matz@suse.com
 
 - Rebase to 8.1 release:
-  * Contains fix for bnc#1068950.
+  * Contains fix for bnc#1068950, CVE-2017-16829.
   * ptype/o prints offsets and sizes of members (like pahole)
   * tab-completion improved: quoting function names is not generally
     necessary anymore, completion offers for breakpoint don't include
diff --git a/qa.sh b/qa.sh
index 21cda4e..b50fa90 100644
--- a/qa.sh
+++ b/qa.sh
@@ -178,9 +178,8 @@ kfail=(
     "FAIL: gdb.base/info-os.exp: continue \(timeout\)"
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=26284
-    # https://sourceware.org/bugzilla/show_bug.cgi?id=28275
     # https://sourceware.org/bugzilla/show_bug.cgi?id=28343
-    #"FAIL: gdb.threads/detach-step-over.exp: .*internal error"
+    "FAIL: gdb.threads/detach-step-over.exp: .*internal error"
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=26363
     "FAIL: gdb.xml/tdesc-reload.exp: .*internal error"
@@ -524,6 +523,9 @@ kfail_powerpc64le=(
     # Commit 8b272d7671f ("[gdb/testsuite] Fix gdb.guile/scm-symtab.exp for
     # ppc64le").
     "FAIL: gdb.guile/scm-symtab.exp: test find-pc-line with resume address"
+
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=29897
+    "FAIL: gdb.base/run-control-while-bg-execution.exp: action1=none: action2=start: start \(GDB internal error\)"
 )
 
 kfail_powerpc64le_sle12=(
@@ -591,6 +593,7 @@ case $n in
 	kfail+=("${kfail_factory[@]}")
 	kfail+=("${kfail_sle12[@]}")
 	kfail+=("${kfail_s390[@]}")
+	kfail+=("${kfail_powerpc64le[@]}")
 	kfail_re=$(join "|" "${kfail[@]}")
 	grep "^FAIL:.*internal error" binaries-testsuite*/gdb-testresults/*.sum \
 	     | grep -E -v "$kfail_re"
@@ -640,6 +643,9 @@ case $n in
 
 	    # https://sourceware.org/bugzilla/show_bug.cgi?id=29841
 	    "regcache.c:[0-9]*: internal-error: raw_read: Assertion \`buf != NULL' failed."
+
+	    # https://sourceware.org/bugzilla/show_bug.cgi?id=29897
+	    "displaced-stepping.c:[0-9]*: internal-error: prepare: Assertion \`buf.current_thread != thread' failed."
 	)
 
 	kfail_re=$(join "|" "${kfail[@]}")