diff --git a/debian/changelog b/debian/changelog
index e3a9f6dd..ec197a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,13 @@ screen-profiles (1.50) unreleased; urgency=low
     carriage return to the F5-refresh keybinding
   * keybindings/common, doc/help.txt: change F8 from advanced help to
     window re-titling (over time, this is far more useful than adv help)
+  * profiles/plain: renamed to NONE to more clearly convey the fact that
+    if you choose this profile, you are not, in fact, using a supplied
+    screen-profile; correct broken symlinks in the 'screen' script
+  * select-screen-profile: set the default, recommended, simple profile
+    to 'light'
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 23 Apr 2009 16:20:15 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 23 Apr 2009 16:59:59 -0500
 
 screen-profiles (1.49-0ubuntu1) jaunty; urgency=low
 
diff --git a/debian/install b/debian/install
index b32c2fd6..a29a340d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,7 +1,7 @@
 bin/* var/lib/screen-profiles
 po/locale/* usr/share/locale
 profiles/common usr/share/screen-profiles/profiles
-profiles/plain usr/share/screen-profiles/profiles
+profiles/NONE usr/share/screen-profiles/profiles
 profiles/black usr/share/screen-profiles/profiles
 profiles/dark usr/share/screen-profiles/profiles
 profiles/light usr/share/screen-profiles/profiles
diff --git a/profiles/plain b/profiles/NONE
similarity index 91%
rename from profiles/plain
rename to profiles/NONE
index a2b21587..27c2816b 100644
--- a/profiles/plain
+++ b/profiles/NONE
@@ -2,11 +2,12 @@
 #    Screen Profile
 #      This configuration profile is the most basic, plain profile,
 #      (the default one that ships with screen).
+#      To clarify that this *disables* screen profiles, let's call this profile
+#      "NONE".
 #
 #    Copyright (C) 2008 Canonical Ltd.
 #
 #    Authors: Dustin Kirkland <kirkland@canonical.com>
-
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/screen b/screen
index 7b39d7c1..8ea2cd48 100755
--- a/screen
+++ b/screen
@@ -45,6 +45,8 @@ if [ -h "$profile" -a ! -r "$profile" ]; then
 		else
 			/usr/bin/select-screen-profile -s "$DEFAULT_PROFILE"
 		fi
+	elif stat "$profile" | head -n1 | grep -qs ".*->.*plain'$"; then
+		ln -sf "/usr/share/screen-profiles/profiles/NONE" "$profile"
 	else
 		/usr/bin/select-screen-profile -s "$DEFAULT_PROFILE"
 	fi
diff --git a/screen-profiles-export b/screen-profiles-export
index ec11b6df..7efef4c1 100755
--- a/screen-profiles-export
+++ b/screen-profiles-export
@@ -21,7 +21,7 @@ PROG="screen-profiles"
 SHARE="/usr/share/$PROG"
 DIR=`mktemp -t -d screen-profiles.XXXXXXXX` || error "Could not create a temporary directory"
 # Grab list of available colors
-colors=`find $SHARE/profiles/ -type f | sed "s/^.*\///" | sed "s/^.*-//" | sort -u | egrep -v "common|plain"`
+colors=`find $SHARE/profiles/ -type f | sed "s/^.*\///" | sed "s/^.*-//" | sort -u | egrep -v "common|plain|NONE"`
 
 # Make sure we clean up $DIR if we exit for any reason
 trap "rm -rf "$DIR" 2>/dev/null || true" EXIT HUP INT QUIT TERM
diff --git a/select-screen-profile b/select-screen-profile
index aeaf962d..c107f5b8 100755
--- a/select-screen-profile
+++ b/select-screen-profile
@@ -57,7 +57,7 @@ assert_symlink "$HOME/.screen-profiles/profile"
 listprofiles() {
 	# Display list of profiles, one per line
 	# Start with basic profiles
-	basename $(ls $PROFILE_DIR/plain 2>/dev/null) 2>/dev/null
+	basename $(ls $PROFILE_DIR/NONE 2>/dev/null) 2>/dev/null
 	basename $(ls $PROFILE_DIR/light 2>/dev/null) 2>/dev/null
 	basename $(ls $PROFILE_DIR/dark 2>/dev/null) 2>/dev/null
 	basename $(ls $PROFILE_DIR/black 2>/dev/null) 2>/dev/null
@@ -81,7 +81,7 @@ prompt() {
 	for x in $profiles; do
 		i=$(expr $i + 1)
 		desc="          "
-		if [ "$x" = "plain" ]; then
+		if [ "$x" = "light" ]; then
 			simple=$i
 		fi
 		[ $i -lt 10 ] && i=" $i"