--- ./lib/config.guess.kiss	2009-12-08 19:15:40.000000000 +0100
+++ ./lib/config.guess	2010-02-12 20:23:37.000000000 +0100
@@ -139,6 +139,35 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+if test x"${CC}" != x
+then
+	echo "`$CC -dumpmachine`"
+	exit ;
+else
+	OLD_IFS=$IFS
+	for CC in gcc cc c89 c99 ; do
+		IFS=:
+		for path in $PATH ; do
+			if test -x "$path/$CC"
+			then
+				set CC=$path/$CC
+				break
+			fi
+		done
+		if test x"${CC}" != x
+		then
+			break
+		fi
+		IFS=$OLD_IFS
+	done
+	IFS=$OLD_IFS
+	if test x"${CC}" != x
+	then
+		echo "`$CC -dumpmachine`"
+		exit ;
+	fi
+fi
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -902,6 +931,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	test x"${LIBC}" != x && {
+		WE_RULE="`$CC_FOR_BUILD -dumpmachine`"
+		case $WE_RULE in
+			*slackware-linux) echo "${WE_RULE}" ; exit ;;
+			*kiss-linux) echo "${WE_RULE}" ; exit ;;
+			*) echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ; exit ;;
+		esac
+	}
 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
--- ./lib/config.sub.kiss	2009-12-08 19:15:40.000000000 +0100
+++ ./lib/config.sub	2010-02-12 20:25:21.000000000 +0100
@@ -130,7 +130,7 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  *)
+  slackware-linux|kiss-linux|*)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
     then os=`echo $1 | sed 's/.*-/-/'`