diff --git a/etc/rc b/etc/rc
index 217367a465..e9f8b93c56 100755
--- a/etc/rc
+++ b/etc/rc
@@ -41,7 +41,14 @@ fi
 # Enable Softupdates if enablesoftupdates is found in config.xml
 SOFTUPDATES=`/usr/bin/grep "enablesoftupdates" /cf/conf/config.xml | wc -l`
 if [ $SOFTUPDATES -gt 0 ]; then
-	/sbin/tunefs -n enable / 2>/dev/null
+	FILESYSTEM=`cat /etc/fstab | grep "/" | grep ufs | awk '{ print $1 }'`
+	/sbin/tunefs -n enable $FILESYSTEM 2>/dev/null
+	if [ $? != 0 ]; then
+		echo "Cleaning filesystem..."
+		fsck -y $FILESYSTEM
+		echo "Attempting soft updates enable again..."
+		/sbin/tunefs -n enable $FILESYSTEM
+	fi
 fi
 
 # Enable console output if its muted.