diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d32cfd0c94..c2037996bf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-19  Andreas Arnez  <arnez@linux.ibm.com>
+
+	* s390-tdep.c (s390_pseudo_register_type): For v0-v15 don't yield
+	the possibly non-existent tdesc type 'vec128', but the type of raw
+	register v16 instead.
+
 2018-10-19  Gary Benson <gbenson@redhat.com>
 
 	* cli/cli-interp.c (cli_interp::~cli_interp): New function.
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 81fa0329ea..23689aa71a 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -1275,8 +1275,9 @@ s390_pseudo_register_type (struct gdbarch *gdbarch, int regnum)
   if (regnum_is_gpr_full (tdep, regnum))
     return builtin_type (gdbarch)->builtin_uint64;
 
+  /* For the "concatenated" vector registers use the same type as v16.  */
   if (regnum_is_vxr_full (tdep, regnum))
-    return tdesc_find_type (gdbarch, "vec128");
+    return tdesc_register_type (gdbarch, S390_V16_REGNUM);
 
   internal_error (__FILE__, __LINE__, _("invalid regnum"));
 }