diff --git a/Changes b/Changes
index 60e0cb8f8..9ec8a07f7 100644
--- a/Changes
+++ b/Changes
@@ -371,3 +371,5 @@
 - Made /zline not memory corrupt/crash, bad df bug
 - Fixed a counting bug with unknown connections, very hopefully
 - Fixed /htm giving wrong response when /htm to 1
+- Fixed /shun showing "1970" to permanently shunned users
+- Fixed ./Config showing freebsd 3.0 in freebsd 4
\ No newline at end of file
diff --git a/Config b/Config
index 17c325a16..a6e92d31b 100755
--- a/Config
+++ b/Config
@@ -11,7 +11,7 @@
 # distribution without the author's prior consent.
 #
 # $Id$
-IRCD_VERSION="Unreal3.1-beta3"
+IRCD_VERSION="Unreal3.1"
 CONF_DATE=`date`
 LAST_VERSION="very very old"
 #
@@ -142,6 +142,14 @@ case "$OS" in
         CRYPT_LINK_PASSWORD=""
         echo "You are using FreeBSD 2.2; do NOT crypt passwords at this time"
         ;;
+    *FreeBSD*4.0*)
+        DEFCFLAGS="$DEFOPT"
+        DEFLIBS="-lcrypt"
+        OSNAME="FreeBSD 4.0"
+        CRYPT_OPER_PASSWORD=""
+        CRYPT_LINK_PASSWORD=""
+        echo "You are using FreeBSD 4.0; You can use encrypted passwords now."
+        ;;
     *FreeBSD*3*)
         DEFCFLAGS="$DEFOPT"
         DEFLIBS="-lcrypt"
diff --git a/src/s_kline.c b/src/s_kline.c
index d6866eed2..447250bc7 100644
--- a/src/s_kline.c
+++ b/src/s_kline.c
@@ -325,8 +325,13 @@ int  find_tkline_match(cptr, xx)
 				strncpy(gmt2, asctime(gmtime((clock_t *) &lp->expire_at)),
 				      sizeof(gmt2));
 	           		gmt2[strlen(gmt2) - 1] = '\0';
-				sendto_one(cptr, ":%s NOTICE %s :*** You have been shunned by %s until %s (Reason: %s)", 
-					me.name, cptr->name, lp->setby, gmt2, lp->reason);
+				if (lp->expire_at)
+					sendto_one(cptr, ":%s NOTICE %s :*** You have been shunned by %s until %s (Reason: %s)", 
+						me.name, cptr->name, lp->setby, gmt2, lp->reason);
+				else
+					sendto_one(cptr, ":%s NOTICE %s :*** You have been shunned permanently by %s (Reason: %s)", 
+						me.name, cptr->name, lp->setby, lp->reason);
+						
 				return -1;
 			}
 		}