diff --git a/ChangeLog b/ChangeLog
index 1d7f051..a323fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-16  John Darrington <john@darrington.wattle.id.au>
+
+	* config.sub (s12z, hcs12z, m68hcs12z, m9s12z): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2018-03-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* config.guess: Use before-save-hook not write-file-functions.
diff --git a/config.sub b/config.sub
index 9ccf09a..c2bc81e 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-03-08'
+timestamp='2018-04-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -335,6 +335,10 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
+	m9s12z | m68hcs12z | hcs12z | s12z)
+		basic_machine=s12z-unknown
+		os=-none
+		;;
 	ms1)
 		basic_machine=mt-unknown
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 0c7aa4f..2ecbe7f 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -568,3 +568,7 @@ xtensa						xtensa-unknown-none
 z80-coff					z80-unknown-coff
 z80						z80-unknown-none
 z8k						z8k-unknown-none
+m9s12z						s12z-unknown-none
+m68hcs12z					s12z-unknown-none
+hcs12z						s12z-unknown-none
+s12z						s12z-unknown-none