diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 2f5313e2c..b1528c1ca 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1221,10 +1221,10 @@
     },
 
 #### Cygwin
-    "Cygwin" => {
+    "Cygwin-i686" => {
         inherit_from     => [ asm("x86_asm") ],
         cc               => "gcc",
-        cflags           => "-DTERMIOS -DL_ENDIAN -march=i486 -Wall",
+        cflags           => "-DTERMIOS -DL_ENDIAN -Wall",
         debug_cflags     => "-g -O0",
         release_cflags   => "-O3 -fomit-frame-pointer",
         sys_id           => "CYGWIN",
diff --git a/config b/config
index 1683f0788..6f8ee91bb 100755
--- a/config
+++ b/config
@@ -323,15 +323,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "${MACHINE}-whatever-mingw"; exit 0;
 	;;
     CYGWIN*)
-	case "$RELEASE" in
-	    [bB]*|1.0|1.[12].*)
-		echo "${MACHINE}-whatever-cygwin_pre1.3"
-		;;
-	    *)
-		echo "${MACHINE}-whatever-cygwin"
-		;;
-	esac
-	exit 0
+	echo "${MACHINE}-pc-cygwin"; exit 0
 	;;
 
     vxworks*)
@@ -814,8 +806,7 @@ case "$GUESSOS" in
 	fi
 	;;
   # these are all covered by the catchall below
-  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
-  *-*-cygwin) OUT="Cygwin" ;;
+  *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
   x86pc-*-qnx6) OUT="QNX6-i386" ;;
   *-*-qnx6) OUT="QNX6" ;;
   x86-*-android|i?86-*-android) OUT="android-x86" ;;