diff --git a/ChangeLog b/ChangeLog
index b47e529d..c4feb122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+  26 Aug 2007; Mike Frysinger <vapier@gentoo.org>:
+
+    Add /etc/gentoo-release to CONFIG_PROTECT_MASK.
+
   25 Aug 2007; Mike Frysinger <vapier@gentoo.org>:
 
     Make sure we list all config files in rc help output.
diff --git a/etc/env.d/00basic b/etc/env.d/00basic
index 65f3b01e..c4912df8 100644
--- a/etc/env.d/00basic
+++ b/etc/env.d/00basic
@@ -1,4 +1,5 @@
 # /etc/env.d/00basic
+# Do not edit this file
 
 PATH="/opt/bin"
 ROOTPATH="/opt/bin"
@@ -6,3 +7,4 @@ LDPATH="/usr/local/lib"
 MANPATH="/usr/local/share/man:/usr/share/man"
 INFOPATH="/usr/share/info"
 CVS_RSH="ssh"
+CONFIG_PROTECT_MASK="/etc/gentoo-release"