diff --git a/SOURCES/_gdb.spec.Patch.include b/SOURCES/_gdb.spec.Patch.include
index 12d65a5..0b35c97 100644
--- a/SOURCES/_gdb.spec.Patch.include
+++ b/SOURCES/_gdb.spec.Patch.include
@@ -670,3 +670,7 @@ Patch163: gdb-rhbz1768593-s390x-arch13-02.patch
# RHBZ 1768593, Andreas Krebbel
Patch164: gdb-rhbz1768593-s390x-arch13-03.patch
+# Backport z15 record/replay
+# Andreas Arnaz, RH BZ 1659535
+Patch165: gdb-rhbz1659535-z15-record-replay.patch
+
diff --git a/SOURCES/_gdb.spec.patch.include b/SOURCES/_gdb.spec.patch.include
index 03c1fad..526e285 100644
--- a/SOURCES/_gdb.spec.patch.include
+++ b/SOURCES/_gdb.spec.patch.include
@@ -162,3 +162,4 @@
%patch162 -p1
%patch163 -p1
%patch164 -p1
+%patch165 -p1
diff --git a/SOURCES/gdb-rhbz1659535-z15-record-replay.patch b/SOURCES/gdb-rhbz1659535-z15-record-replay.patch
new file mode 100644
index 0000000..6385b36
--- /dev/null
+++ b/SOURCES/gdb-rhbz1659535-z15-record-replay.patch
@@ -0,0 +1,170 @@
+;; Backport z15 record/replay
+;; Andreas Arnaz, RH BZ 1659535
+
+commit 6d9d6da48e84a65871a9d72fa785105d603990a6
+Author: Andreas Arnez <arnez@linux.ibm.com>
+Date: Wed Oct 9 11:09:22 2019 +0200
+
+ s390: Add record/replay support for arch13 instructions
+
+ Enable recording most of the new "arch13" instructions on z/Architecture
+ targets, except for the specialized-function-assist instructions:
+
+ SORTL - sort lists
+ DFLTCC - deflate conversion call
+ KDSA - compute digital signature authentication
+
+ gdb/ChangeLog:
+
+ * s390-tdep.c (390_process_record): Handle new arch13 instructions
+ except SORTL, DFLTCC, and KDSA.
+
+diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
+--- a/gdb/s390-tdep.c
++++ b/gdb/s390-tdep.c
+@@ -4101,6 +4101,7 @@ ex:
+ case 0xb998: /* ALCR - add logical with carry */
+ case 0xb999: /* SLBR - subtract logical with borrow */
+ case 0xb9f4: /* NRK - and */
++ case 0xb9f5: /* NCRK - and with complement */
+ case 0xb9f6: /* ORK - or */
+ case 0xb9f7: /* XRK - xor */
+ case 0xb9f8: /* ARK - add */
+@@ -4133,20 +4134,32 @@ ex:
+ case 0xb919: /* SGFR - subtract */
+ case 0xb91a: /* ALGFR - add logical */
+ case 0xb91b: /* SLGFR - subtract logical */
++ case 0xb964: /* NNGRK - and 64 bit */
++ case 0xb965: /* OCGRK - or with complement 64 bit */
++ case 0xb966: /* NOGRK - or 64 bit */
++ case 0xb967: /* NXGRK - not exclusive or 64 bit */
++ case 0xb974: /* NNRK - and 32 bit */
++ case 0xb975: /* OCRK - or with complement 32 bit */
++ case 0xb976: /* NORK - or 32 bit */
++ case 0xb977: /* NXRK - not exclusive or 32 bit */
+ case 0xb980: /* NGR - and */
+ case 0xb981: /* OGR - or */
+ case 0xb982: /* XGR - xor */
+ case 0xb988: /* ALCGR - add logical with carry */
+ case 0xb989: /* SLBGR - subtract logical with borrow */
++ case 0xb9c0: /* SELFHR - select high */
+ case 0xb9e1: /* POPCNT - population count */
+ case 0xb9e4: /* NGRK - and */
++ case 0xb9e5: /* NCGRK - and with complement */
+ case 0xb9e6: /* OGRK - or */
+ case 0xb9e7: /* XGRK - xor */
+ case 0xb9e8: /* AGRK - add */
+ case 0xb9e9: /* SGRK - subtract */
+ case 0xb9ea: /* ALGRK - add logical */
++ case 0xb9e3: /* SELGR - select 64 bit */
+ case 0xb9eb: /* SLGRK - subtract logical */
+ case 0xb9ed: /* MSGRKC - multiply single 64x64 -> 64 */
++ case 0xb9f0: /* SELR - select 32 bit */
+ case 0xb9fd: /* MSRKC - multiply single 32x32 -> 32 */
+ /* 64-bit gpr destination + flags */
+ if (s390_record_gpr_g (gdbarch, regcache, inib[6]))
+@@ -4522,7 +4535,13 @@ ex:
+ return -1;
+ break;
+
+- /* 0xb932-0xb93b undefined */
++ /* 0xb932-0xb937 undefined */
++
++ /* 0xb938 unsupported: SORTL - sort lists */
++ /* 0xb939 unsupported: DFLTCC - deflate conversion call */
++ /* 0xb93a unsupported: KDSA - compute dig. signature auth. */
++
++ /* 0xb93b undefined */
+
+ case 0xb93c: /* PPNO - perform pseudorandom number operation [partial] */
+ regcache_raw_read_unsigned (regcache, S390_R1_REGNUM, &tmp);
+@@ -5452,6 +5471,13 @@ ex:
+ /* 0xe3ce undefined */
+ /* 0xe3d0-0xe3ff undefined */
+
++ case 0xe601: /* VLEBRH - vector load byte reversed element */
++ case 0xe602: /* VLEBRG - vector load byte reversed element */
++ case 0xe603: /* VLEBRF - vector load byte reversed element */
++ case 0xe604: /* VLLEBRZ - vector load byte rev. el. and zero */
++ case 0xe605: /* VLBRREP - vector load byte rev. el. and replicate */
++ case 0xe606: /* VLBR - vector load byte reversed elements */
++ case 0xe607: /* VLER - vector load elements reversed */
+ case 0xe634: /* VPKZ - vector pack zoned */
+ case 0xe635: /* VLRL - vector load rightmost with immed. length */
+ case 0xe637: /* VLRLR - vector load rightmost with length */
+@@ -5514,6 +5540,9 @@ ex:
+ case 0xe77f: /* VSRAB - vector shift right arithmetic by byte */
+ case 0xe784: /* VPDI - vector permute doubleword immediate */
+ case 0xe785: /* VBPERM - vector bit permute */
++ case 0xe786: /* VSLD - vector shift left double by bit */
++ case 0xe787: /* VSRD - vector shift right double by bit */
++ case 0xe78b: /* VSTRS - vector string search */
+ case 0xe78c: /* VPERM - vector permute */
+ case 0xe78d: /* VSEL - vector select */
+ case 0xe78e: /* VFMS - vector fp multiply and subtract */
+@@ -5542,10 +5571,10 @@ ex:
+ case 0xe7bc: /* VGFMA - vector Galois field multiply sum and accumulate */
+ case 0xe7bd: /* VSBCBI - vector subtract with borrow compute borrow indication */
+ case 0xe7bf: /* VSBI - vector subtract with borrow indication */
+- case 0xe7c0: /* VCLGD - vector convert to logical 64-bit */
+- case 0xe7c1: /* VCDLG - vector convert from logical 64-bit */
+- case 0xe7c2: /* VCGD - vector convert to fixed 64-bit */
+- case 0xe7c3: /* VCDG - vector convert from fixed 64-bit */
++ case 0xe7c0: /* VCLFP - vector fp convert to logical */
++ case 0xe7c1: /* VCFPL - vector fp convert from logical */
++ case 0xe7c2: /* VCSFP - vector fp convert to fixed */
++ case 0xe7c3: /* VCFPS - vector fp convert from fixed */
+ case 0xe7c4: /* VLDE/VFLL - vector fp load lengthened */
+ case 0xe7c5: /* VLED/VFLR - vector fp load rounded */
+ case 0xe7c7: /* VFI - vector load fp integer */
+@@ -5596,6 +5625,7 @@ ex:
+ return -1;
+ break;
+
++ case 0xe609: /* VSTEBRH - vector store byte reversed element */
+ case 0xe709: /* VSTEH - vector store element */
+ oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], 0);
+ if (record_full_arch_list_add_mem (oaddr, 2))
+@@ -5604,6 +5634,7 @@ ex:
+ return -1;
+ break;
+
++ case 0xe60a: /* VSTEBRG - vector store byte reversed element */
+ case 0xe70a: /* VSTEG - vector store element */
+ oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], 0);
+ if (record_full_arch_list_add_mem (oaddr, 8))
+@@ -5612,6 +5643,7 @@ ex:
+ return -1;
+ break;
+
++ case 0xe60b: /* VSTEBRF - vector store byte reversed element */
+ case 0xe70b: /* VSTEF - vector store element */
+ oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], 0);
+ if (record_full_arch_list_add_mem (oaddr, 4))
+@@ -5622,6 +5654,8 @@ ex:
+
+ /* 0xe70c-0xe70d undefined */
+
++ case 0xe60e: /* VSTBR - vector store byte reversed elements */
++ case 0xe60f: /* VSTER - vector store elements reversed */
+ case 0xe70e: /* VST - vector store */
+ oaddr = s390_record_calc_disp (gdbarch, regcache, inib[3], insn[1], 0);
+ if (record_full_arch_list_add_mem (oaddr, 16))
+@@ -6201,7 +6235,16 @@ ex:
+ /* SSE/SIL-format instruction */
+ switch (insn[0])
+ {
+- /* 0xe500-0xe543 undefined, privileged, or unsupported */
++ /* 0xe500-0xe509 undefined, privileged, or unsupported */
++
++ case 0xe50a: /* MVCRL - move right to left */
++ regcache_raw_read_unsigned (regcache, S390_R0_REGNUM, &tmp);
++ oaddr = s390_record_calc_disp (gdbarch, regcache, 0, insn[1], 0);
++ if (record_full_arch_list_add_mem (oaddr, (tmp & 0xff) + 1))
++ return -1;
++ break;
++
++ /* 0xe50b-0xe543 undefined, privileged, or unsupported */
+
+ case 0xe544: /* MVHHI - move */
+ oaddr = s390_record_calc_disp (gdbarch, regcache, 0, insn[1], 0);
diff --git a/SPECS/gdb.spec b/SPECS/gdb.spec
index 4abc60b..41ef67d 100644
--- a/SPECS/gdb.spec
+++ b/SPECS/gdb.spec
@@ -26,7 +26,7 @@ Version: 8.2
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
Group: Development/Debuggers
@@ -1034,6 +1034,9 @@ fi
%endif
%changelog
+* Tue May 12 2020 Keith Seitz <keiths@redhat.com> - 8.2-12.el8
+- Include support for z15 record/replay (RH BZ 1659535)
+
* Thu Jan 23 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2-11.el8
- Revert previous change (RH BZ 1786466).