diff --git a/tcshrc.system b/tcshrc.system
index 7ff64d8..5d78918 100644
--- a/tcshrc.system
+++ b/tcshrc.system
@@ -11,11 +11,9 @@ endif
 
 
 # Cygwin systems are kinda funky -- so we fix them up to say "Cygwin"
-switch( ${CSHENV_SYSTEM} )
-	case CYGWIN_NT-6.1-WOW64:
-		setenv CSHENV_SYSTEM Cygwin
-	breaksw
-endsw
+#if( echo ${CSHENV_SYSTEM} | grep -i "cygwin" >& /dev/null ) then
+    #setenv CSHENV_SYSTEM Cygwin
+#endsw
 
 if( $?CSHENV_DEBUG ) then
 	echo 'Detected that you are running on a "'${CSHENV_SYSTEM}'" system'
diff --git a/tcshrc.system.common b/tcshrc.system.common
index 4cb8322..511d65e 100644
--- a/tcshrc.system.common
+++ b/tcshrc.system.common
@@ -124,6 +124,15 @@ switch( ${CSHENV_SYSTEM} )
 		setenv CSHENV_HOSTNAME `hostname | tr "[:upper:]" "[:lower:]"`
 	breaksw
 
+	#Linux may be different, yet still
+	case Linux:
+		if( $?CSHENV_DEBUG ) then
+			echo "BSD-like hostname hack."
+		endif
+
+		setenv CSHENV_HOSTNAME `hostname | tr "[:upper:]" "[:lower:]"`
+	breaksw
+
 	#BSD like hostnames, and non-broken ones.
 	default:
 		if( $?CSHENV_DEBUG ) then