diff --git a/Makefile.vex.am b/Makefile.vex.am
index b84ba4e..26b0278 100644
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -24,6 +24,7 @@
 	pub/libvex_guest_ppc32.h \
 	pub/libvex_guest_ppc64.h \
 	pub/libvex_guest_arm.h \
+	pub/libvex_guest_s390x.h \
 	pub/libvex_ir.h \
 	pub/libvex_trc_values.h
 
@@ -38,13 +39,16 @@
 	priv/guest_amd64_defs.h \
 	priv/guest_ppc_defs.h \
 	priv/guest_arm_defs.h \
+	priv/guest_s390_defs.h \
 	priv/host_generic_regs.h \
 	priv/host_generic_simd64.h \
 	priv/host_generic_simd128.h \
 	priv/host_x86_defs.h \
 	priv/host_amd64_defs.h \
 	priv/host_ppc_defs.h \
-	priv/host_arm_defs.h
+	priv/host_arm_defs.h \
+	priv/host_s390_defs.h \
+	priv/host_s390_disasm.h
 
 BUILT_SOURCES = pub/libvex_guest_offsets.h
 CLEANFILES    = pub/libvex_guest_offsets.h
@@ -58,7 +62,8 @@
 			    pub/libvex_guest_amd64.h \
 			    pub/libvex_guest_ppc32.h \
 			    pub/libvex_guest_ppc64.h \
-			    pub/libvex_guest_arm.h
+			    pub/libvex_guest_arm.h \
+			    pub/libvex_guest_s390x.h
 	rm -f auxprogs/genoffsets.s
 	$(CC) $(LIBVEX_CFLAGS) \
 	      $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
@@ -97,6 +102,8 @@
 	priv/guest_ppc_toIR.c \
 	priv/guest_arm_helpers.c \
 	priv/guest_arm_toIR.c \
+	priv/guest_s390_helpers.c \
+	priv/guest_s390_toIR.c \
 	priv/host_generic_regs.c \
 	priv/host_generic_simd64.c \
 	priv/host_generic_simd128.c \
@@ -108,7 +115,10 @@
 	priv/host_ppc_defs.c \
 	priv/host_ppc_isel.c \
 	priv/host_arm_defs.c \
-	priv/host_arm_isel.c
+	priv/host_arm_isel.c \
+	priv/host_s390_defs.c \
+	priv/host_s390_isel.c \
+	priv/host_s390_disasm.c
 
 LIBVEX_CFLAGS = \
 	-Wbad-function-cast \