diff --git a/ChangeLog b/ChangeLog
index ab519b9..0c9d69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-30  Keno Fischer  <keno@juliacomputing.com>
+
+	* config.sub (*-emscripten): Recognise.
+	* testsute/config-sub.data: Add test cases.
+
 2018-12-21  Ben Elliston  <bje@gnu.org>
 
 	Revert 2018-07-18 change:
diff --git a/config.sub b/config.sub
index a5081b8..3d579cf 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-12-16'
+timestamp='2018-12-31'
 
 # 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
@@ -1361,7 +1361,7 @@ case $os in
 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed*)
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	qnx*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 58d42fe..867e7f1 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -92,6 +92,7 @@ armv8m						armv8m-unknown-none
 armv8r						armv8r-unknown-none
 aros						i386-pc-aros
 asmjs						asmjs-unknown-none
+asmjs-emscripten				asmjs-unknown-emscripten
 avr32						avr32-unknown-none
 avr32-linux					avr32-unknown-linux-gnu
 avr						avr-unknown-none
@@ -613,6 +614,7 @@ visium-elf					visium-unknown-elf
 visium						visium-unknown-none
 vsta						i386-pc-vsta
 wasm32						wasm32-unknown-none
+wasm32-emscripten				wasm32-unknown-emscripten
 we32k						we32k-att-sysv
 x64						x86_64-pc-none
 x64-linux					x86_64-pc-linux-gnu