diff --git a/ChangeLog b/ChangeLog
index c79c20f..03bb272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-23  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Don't force basic_machine based on $os just for
+	"mint" and "clix".
+
 2018-05-23  John Ericson  <john.ericson@obsidian.systems>
 
 	* config.sub: No more OS-driven substitution of -pc with sed.
diff --git a/config.sub b/config.sub
index 3172045..ecc5c5e 100755
--- a/config.sub
+++ b/config.sub
@@ -607,9 +607,6 @@ case $os in
 	isc)
 		os=isc2.2
 		;;
-	clix*)
-		basic_machine=clipper-intergraph
-		;;
 	lynx*178)
 		os=lynxos178
 		;;
@@ -625,10 +622,6 @@ case $os in
 	psos*)
 		os=psos
 		;;
-	mint | mint[0-9]*)
-		basic_machine=m68k-atari
-		os=mint
-		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
@@ -1586,6 +1579,9 @@ case $basic_machine in
 	c8051-*)
 		os=elf
 		;;
+	clipper-intergraph)
+		os=clix
+		;;
 	hexagon-*)
 		os=elf
 		;;
@@ -1779,6 +1775,9 @@ case $basic_machine in
 			genix*)
 				vendor=ns
 				;;
+			clix*)
+				vendor=intergraph
+				;;
 			mvs* | opened*)
 				vendor=ibm
 				;;