diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 49cb7ab5ce5..7cec01e8aeb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-07-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	Backport from mainline
+	2017-07-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	PR target/81348
+	* config/rs6000/rs6000.md (HI sign_extend splitter): Use the
+	correct operand in doing the split.
+
 2017-07-07  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
 	* config/sparc/m8.md: New file.
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 8176dd758a3..3323976a35d 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -954,7 +954,7 @@
    (set (match_dup 0)
 	(sign_extend:EXTHI (match_dup 2)))]
 {
-  operands[2] = gen_rtx_REG (HImode, REGNO (operands[1]));
+  operands[2] = gen_rtx_REG (HImode, REGNO (operands[0]));
 })
 
 (define_insn "*extendhi<mode>2_noload"
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d654820a464..21b0fa49ed9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-07-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	Backport from mainline
+	2017-07-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	PR target/81348
+	* gcc.target/powerpc/pr81348.c: New test.
+
 2017-07-07  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
 	* gcc.target/sparc/dictunpack.c: New file.
diff --git a/gcc/testsuite/gcc.target/powerpc/pr81348.c b/gcc/testsuite/gcc.target/powerpc/pr81348.c
new file mode 100644
index 00000000000..e8e10bb598b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr81348.c
@@ -0,0 +1,24 @@
+/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
+/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power9" } } */
+/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mcpu=power9 -Og" } */
+
+/* PR target/81348: Compiler died in doing short->float conversion due to using
+   the wrong register in a define_split.  */
+
+int a;
+short b;
+float ***c;
+
+void d(void)
+{
+        int e = 3;
+
+        if (a)
+                e = b;
+
+        ***c = e;
+}
+
+/* { dg-final { scan-assembler {\mlxsihzx\M}  } } */
+/* { dg-final { scan-assembler {\mvextsh2d\M} } } */