diff --git a/ChangeLog b/ChangeLog
index c4c558e..0e49c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-12  Christian Svensson  <blue@cmd.nu>
+
+	* config.guess (or1k:Linux:*:*): New.
+	* config.sub (or1k): Likewise.
+	* testsuite/config-guess.data: Test for or1k:Linux.
+	* testsuite/config-sub.data: Tests for or1k-linux, or1k-elf.
+
 2013-02-04  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Contract the list of copyright years into the
diff --git a/config.guess b/config.guess
index 6ea3454..f475ceb 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2013-02-12'
 
 # 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
@@ -953,6 +953,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     or32:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
diff --git a/config.sub b/config.sub
index 80211d0..872199a 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2013-02-12'
 
 # 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
@@ -296,7 +296,7 @@ case $basic_machine in
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -1589,6 +1589,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 0d18ea6..0ec1ee9 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -36,6 +36,7 @@ NEO-1	1.0			NONSTOP_KERNEL	ignored	neo-tandem-nsk1.0
 NSE-1	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 NSE-N	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 NSE-NN	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
+or1k	ignored			Linux		ignored	or1k-unknown-linux-gnu
 or32	ignored			Linux		ignored	or32-unknown-linux-gnu
 padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu
 pc	1.0			ignored		ignored	i586-pc-msdosdjgpp
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 379cda6..7cc53a8 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -147,6 +147,8 @@ nios				nios-unknown-none
 open8-elf			open8-unknown-elf
 open8				open8-unknown-none
 openrisc-linux			or32-unknown-linux-gnu
+or1k-elf			or1k-unknown-elf
+or1k-linux			or1k-unknown-linux-gnu
 or32-linux			or32-unknown-linux-gnu
 os400				powerpc-ibm-os400
 parisc				hppa-unknown-linux-gnu