diff --git a/gdb.changes b/gdb.changes
index 830341d..d25eb94 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  5 15:21:03 UTC 2021 - Tom de Vries <tdevries@suse.com>
+
+- Maintenance script qa.sh:
+  * Add PR28551 KFAIL.
+  * Add missing quotes for some KFAILs.
+  * Remove PR28355 KFAIL.
+
 -------------------------------------------------------------------
 Tue Nov  2 13:03:51 UTC 2021 - Tom de Vries <tdevries@suse.com>
 
diff --git a/qa.sh b/qa.sh
index 1fba067..ee9f61d 100644
--- a/qa.sh
+++ b/qa.sh
@@ -131,6 +131,8 @@ kfail_factory=(
     # https://sourceware.org/bugzilla/show_bug.cgi?id=27238
     "FAIL: gdb.go/package.exp: setting breakpoint at package2.Foo"
     "FAIL: gdb.go/package.exp: going to first breakpoint \(the program exited\)"
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=28551
+    "FAIL: gdb.go/package.exp: going to first breakpoint \\(GDB internal error\\)"
     # https://sourceware.org/bugzilla/show_bug.cgi?id=28468
     "FAIL: gdb.threads/signal-command-handle-nopass.exp: step-over (yes|no): signal SIGUSR1"
     # https://sourceware.org/bugzilla/show_bug.cgi?id=28477
@@ -140,8 +142,8 @@ kfail_factory=(
     # https://sourceware.org/bugzilla/show_bug.cgi?id=26867
     "FAIL: gdb.threads/signal-sigtrap.exp: sigtrap thread 1: signal SIGTRAP reaches handler"
     # https://sourceware.org/bugzilla/show_bug.cgi?id=28510
-    FAIL: gdb.debuginfod/fetch_src_and_symbols.exp: local_url: br main
-    FAIL: gdb.debuginfod/fetch_src_and_symbols.exp: local_url: l
+    "FAIL: gdb.debuginfod/fetch_src_and_symbols.exp: local_url: br main"
+    "FAIL: gdb.debuginfod/fetch_src_and_symbols.exp: local_url: l"
 )
 
 case $n in
@@ -149,6 +151,8 @@ case $n in
 	# 'FAIL: .* internal error' in gdb.sum.
 	# Test fail due to internal error.
 	#
+	# Todo: apply kfail_factory only on factory sum files.
+	kfail+=("${kfail_factory[@]}")
 	kfail_re=$(join "|" "${kfail[@]}")
 	grep "^FAIL:.*internal error" binaries-testsuite*/gdb-testresults/*.sum \
 	     | grep -E -v "$kfail_re"
@@ -159,8 +163,6 @@ case $n in
 	# A dejagnu or tcl ERROR, may hide real problems.
 	#
 	kfail+=(
-	    # https://sourceware.org/bugzilla/show_bug.cgi?id=28355
-	    "openSUSE_Factory_ARM.aarch64.*UNRESOLVED: gdb.server/.*.exp: (ensure inferior is running|set sysroot remote)"
 	    # https://sourceware.org/bugzilla/show_bug.cgi?id=28323
 	    "SLE-12.x86_64.*gdb.ada/mi_dyn_arr.exp"
 	)