diff --git a/config.sub b/config.sub
index 7d64803..c62d8de 100755
--- a/config.sub
+++ b/config.sub
@@ -1633,7 +1633,8 @@ case $os in
 		os=sysv
 		;;
 	nova*)
-		os=rtmk-nova
+		kernel=rtmk
+		os=nova
 		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
@@ -2017,6 +2018,7 @@ case $os in
 	| nextstep* \
 	| nindy* \
 	| nonstopux* \
+	| nova* \
 	| nsk* \
 	| nucleus* \
 	| nx6 \
@@ -2197,6 +2199,8 @@ case $kernel-$os-$obj in
 		;;
 	os2-emx-)
 		;;
+	rtmk-nova-)
+		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
 	none--*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 915057a..84b4a06 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -332,6 +332,7 @@ i386-mingw32					i386-pc-mingw32
 i386-msys					i386-pc-msys
 i386-netbsd					i386-pc-netbsd
 i386-next-openstep4				i386-next-openstep4
+i386-nova					i386-pc-rtmk-nova
 i386-openbsd					i386-pc-openbsd
 i386-os2					i386-pc-os2
 i386-pc-nacl					i386-pc-nacl