diff --git a/gdb-fix-watchpoints-triggered.patch b/gdb-fix-watchpoints-triggered.patch
deleted file mode 100644
index 830aa36..0000000
--- a/gdb-fix-watchpoints-triggered.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 1e524b5942f..459bc13f398 100644
---- a/gdb/breakpoint.c
-+++ b/gdb/breakpoint.c
-@@ -4916,6 +4916,7 @@ watchpoints_triggered (const target_waitstatus &ws)
-      affected by this data address as triggered, and all others as not
-      triggered.  */
- 
-+  size_t triggered_cnt = 0;
-   for (breakpoint *b : all_breakpoints ())
-     if (is_hardware_watchpoint (b))
-       {
-@@ -4932,6 +4933,7 @@ watchpoints_triggered (const target_waitstatus &ws)
- 		if (newaddr == start)
- 		  {
- 		    w->watchpoint_triggered = watch_triggered_yes;
-+		    triggered_cnt++;
- 		    break;
- 		  }
- 	      }
-@@ -4941,11 +4943,26 @@ watchpoints_triggered (const target_waitstatus &ws)
- 			loc->length))
- 	      {
- 		w->watchpoint_triggered = watch_triggered_yes;
-+		triggered_cnt++;
- 		break;
- 	      }
- 	  }
-       }
- 
-+  if (triggered_cnt == 0)
-+    {
-+      /* The target could report the data address.  But none of the
-+	 watchpoints was affected by this data address, so mark all
-+	 watchpoints as unknown.  */
-+      for (breakpoint *b : all_breakpoints ())
-+	if (is_hardware_watchpoint (b))
-+	  {
-+	    struct watchpoint *w = (struct watchpoint *) b;
-+
-+	    w->watchpoint_triggered = watch_triggered_unknown;
-+	  }
-+    }
-+
-   return 1;
- }
- 
diff --git a/gdb.changes b/gdb.changes
index 6e5e169..a6f74f2 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 15 08:14:11 UTC 2022 - Tom de Vries <tdevries@suse.com>
+
+- Maintenance script qa-remote.sh:
+  * Use qa.sh alongside qa-remote.sh.
+- Maintenance script qa.sh:
+  * Add PR29783 internal error.
+- Patch removed (intended effect not observed):
+  * gdb-fix-watchpoints-triggered.patch
+
 -------------------------------------------------------------------
 Fri Nov 11 12:06:44 UTC 2022 - Tom de Vries <tdevries@suse.com>
 
diff --git a/gdb.spec b/gdb.spec
index 1cd794e..2a5f2b5 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -385,8 +385,6 @@ Patch2111:      gdb-testsuite-enable-some-test-cases-for-x86_64-m32.patch
 Patch2112:      gdb-testsuite-fix-gdb.reverse-i387-env-reverse.exp-for-pie.patch
 # https://sourceware.org/pipermail/gdb-patches/2022-July/191107.html
 Patch2113:      gdb-testsuite-fix-gdb.ada-literals.exp-with-aarch64.patch
-# https://sourceware.org/bugzilla/show_bug.cgi?id=29423#c8
-Patch2114:      gdb-fix-watchpoints-triggered.patch
 # https://sourceware.org/pipermail/gdb-patches/2022-September/192172.html
 Patch2115:      gdb-testsuite-fix-gdb.mi-mi-sym-info.exp-on-opensuse-tumbleweed.patch
 
@@ -804,7 +802,6 @@ find -name "*.info*"|xargs rm -f
 %patch2111 -p1
 %patch2112 -p1
 %patch2113 -p1
-%patch2114 -p1
 %patch2115 -p1
 
 #unpack libipt
diff --git a/qa-remote.sh b/qa-remote.sh
index 3a8471f..d070c4b 100644
--- a/qa-remote.sh
+++ b/qa-remote.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+scriptdir=$(cd $(dirname $0); pwd -P)
+
 pwd=$(pwd -P)
 
 root=$pwd/tmp-qa-remote
@@ -150,7 +152,7 @@ case "$n" in
 	shift
 	(
 	    cd $root
-	    bash $pwd/qa.sh $m
+	    bash $scriptdir/qa.sh $m
 	)
 	;;
 
diff --git a/qa.sh b/qa.sh
index 4d20f29..9b13ff2 100644
--- a/qa.sh
+++ b/qa.sh
@@ -441,6 +441,9 @@ case $n in
 	    "record-full.c:[0-9]*: internal-error: ptid_t record_full_wait_1\(target_ops\*, ptid_t, target_waitstatus\*, target_wait_flags\): Assertion \`\(options & TARGET_WNOHANG\) != 0' failed."
 	    # https://sourceware.org/bugzilla/show_bug.cgi?id=26873
 	    "infrun.c:[0-9]*: internal-error: resume_1: Assertion \`!\(thread_has_single_step_breakpoints_set \(tp\) && step\)' failed."
+
+	    # https://sourceware.org/bugzilla/show_bug.cgi?id=29783
+	    "frame.c:[0-9]*: internal-error: get_selected_frame: Assertion \`selected_frame != NULL' failed."
 	)
 
 	kfail_re=$(join "|" "${kfail[@]}")