diff --git a/config.sub b/config.sub
index 39bf2c0..e4c4e09 100755
--- a/config.sub
+++ b/config.sub
@@ -1222,6 +1222,7 @@ case $cpu-$vendor in
 			| moxie \
 			| mt \
 			| msp430 \
+			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1598,7 +1599,7 @@ case $cpu-$vendor in
 		os=
 		obj=elf
 		;;
-	mips*-*)
+	mips*-*|nanomips*-*)
 		os=
 		obj=elf
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 994010b..a46bdfe 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -516,6 +516,7 @@ mt						mt-unknown-none
 mt-elf						mt-unknown-elf
 mvs						i370-ibm-mvs
 nacl						le32-unknown-nacl
+nanomips					nanomips-unknown-elf
 ncr3000						i486-ncr-sysv4
 nds32						nds32-unknown-none
 nds32-elf					nds32-unknown-elf