diff --git a/ChangeLog b/ChangeLog
index c37095f..06e3652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-04  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* config.guess (e2k:Linux:*:*): New.
+	* config.sub (e2k, e2k-*): New.
+	* testsuite/config-guess.data: Add a test case.
+	* testsuite/config-sub.data: Likewise.
+
 2015-02-22  Taylor R Campbell  <riastradh@NetBSD.org>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index 44290b8..f7eb141 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-02-23'
+timestamp='2015-03-04'
 
 # 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
@@ -947,6 +947,9 @@ EOF
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
diff --git a/config.sub b/config.sub
index bc855a2..88307c1 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-02-22'
+timestamp='2015-03-04'
 
 # 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
@@ -259,7 +259,7 @@ case $basic_machine in
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
@@ -381,7 +381,7 @@ case $basic_machine in
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 9328717..538a7ef 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -15,6 +15,7 @@ BePC	1.0	Haiku	ignored	ignored	i586-pc-haiku
 crayx1	2.5.20	UNICOS/mp	ignored	ignored	craynv-cray-unicosmp2.5.X
 cris	2.6.6	Linux	ignored	ignored	cris-axis-linux-gnu
 crisv32	2.6.6	Linux	ignored	ignored	crisv32-axis-linux-gnu
+e2k	2.6.32	Linux	ignored	ignored	e2k-unknown-linux-gnu
 EM64T	5.2	Interix	ignored	ignored	x86_64-unknown-interix5.2
 evbarm	7.0	NetBSD	ignored	arm	arm-unknown-netbsdelf7.0
 evbarm	7.0	NetBSD	ignored	armeb	armeb-unknown-netbsdelf7.0
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 9305076..b3701b4 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -69,6 +69,7 @@ cris-linux			cris-axis-linux-gnu
 crisv32-linux			crisv32-axis-linux-gnu
 dicos				i686-pc-dicos
 djgpp				i586-pc-msdosdjgpp
+e2k-linux			e2k-unknown-linux-gnu
 epiphany-elf			epiphany-unknown-elf
 epiphany			epiphany-unknown-none
 fido-elf			fido-unknown-elf