--- Setup.old	2009-03-09 12:10:13.000000000 -0400
+++ Setup	2009-03-09 12:11:24.000000000 -0400
@@ -965,7 +965,8 @@
 
 	done < $1/Makefile
 
-	KERNEL_VERSION=$KVER"."$KPATCH"."$KLVL$KEVER
+	#KERNEL_VERSION=$KVER"."$KPATCH"."$KLVL$KEVER
+	KERNEL_VERSION=`uname -r`
 
 	if [ $KVER -eq 2 ] && [ $KPATCH -eq 6 ]; then
 		KERN_VER=26;
@@ -3144,7 +3145,8 @@
 	
 	if test -z $NONINTERACTIVE; then
 		if [ -e $SOURCEDIR/include/config/kernel.release ]; then
-			KERNEL_VERSION=`cat $SOURCEDIR/include/config/kernel.release`
+			#KERNEL_VERSION=`cat $SOURCEDIR/include/config/kernel.release`
+			KERNEL_VERSION=`uname -r`
 			echo "Source kernel name:$KERNEL_VERSION"
 		fi
 
@@ -3163,7 +3165,8 @@
 				
 			getyn "Install modules for current image: $KERNEL_UNAME ?"
 			if [ $? -eq 0 ]; then
-				KERNEL_VERSION=$KERNEL_UNAME;
+				#KERNEL_VERSION=$KERNEL_UNAME;
+				KERNEL_VERSION=`uname -r`
 
 				is_distr_fedora2
 				if [ $? -eq 1 ]; then