diff --git a/ChangeLog b/ChangeLog
index a7464cbc..46f7a411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+  02 Sep 2007; Mike Frysinger <vapier@gentoo.org>:
+
+    Always attempt to mount /dev/pts when devpts is available as it may appear
+    in some 2.4 setups.
+
 * baselayout-2.0.0_rc4 (02 Sep 2007)
 
   02 Sep 2007; Roy Marples <uberlord@gentoo.org>:
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index 48ddf548..e9fd98ba 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -197,23 +197,21 @@ else
 	done
 fi
 
-# From linux-2.6 we need to mount /dev/pts again ...
-if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${K26}" = "0" ] ; then
-	if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \
-		! mountinfo /dev/pts > /dev/null ; then
-		if [ ! -d /dev/pts ] && \
-		   [ "${devfs}" = "yes" -o "${udev}" = "yes" ] ; then
-			# Make sure we have /dev/pts
-			mkdir -p /dev/pts >/dev/null 2>/dev/null || \
-				ewarn "Could not create /dev/pts!"
-		fi
+# Mount the new fancy pants /dev/pts whenever possible
+if grep -Eq "[[:space:]]+devpts$" /proc/filesystems && \
+	! mountinfo /dev/pts > /dev/null ; then
+	if [ ! -d /dev/pts ] && \
+	   [ "${devfs}" = "yes" -o "${udev}" = "yes" ] ; then
+		# Make sure we have /dev/pts
+		mkdir -p /dev/pts >/dev/null 2>/dev/null || \
+			ewarn "Could not create /dev/pts!"
+	fi
 
-		if [ -d /dev/pts ] ; then
-			ebegin "Mounting devpts at /dev/pts"
-			mntcmd="$(fstabinfo --mountcmd /dev/pts)"
-			try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts}
-			eend $?
-		fi
+	if [ -d /dev/pts ] ; then
+		ebegin "Mounting devpts at /dev/pts"
+		mntcmd="$(fstabinfo --mountcmd /dev/pts)"
+		try mount -n ${mntcmd:--t devpts -o gid=5,mode=0620,noexec,nosuid devpts /dev/pts}
+		eend $?
 	fi
 fi