diff --git a/debian/changelog b/debian/changelog
index b19e518d..642dc490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 screen-profiles (1.25) UNRELEASED; urgency=low
 
-  * 
+  * screen: don't prompt with select-screen-profile, if ~/.screenrc exists
+    and ~/.screenrc-profile does not
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 16 Feb 2009 16:37:10 -0600
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 16 Feb 2009 20:35:53 -0600
 
 screen-profiles (1.24-0ubuntu1) jaunty; urgency=low
 
diff --git a/screen b/screen
index 8b3fd673..6b1f48f3 100755
--- a/screen
+++ b/screen
@@ -17,8 +17,15 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# If ~/.screenrc exists but ~/.screenrc-profile does not, this shows that the
+# user has an existing custom screen configuration, and thus we will not
+# bother them with a select-screen-profile prompt
+if [ -r "$HOME/.screenrc" -a ! -e "$HOME/.screenrc-profile" ]; then
+	exec /usr/bin/screen.real -c "$HOME/.screenrc" "$@"
+	exit $?
+fi
 
-# Ensure that the user has selected a screen profile
+# Otherwise, let's ensure that the user has selected a screen profile
 [ -r "$HOME/.screenrc-profile" ] || /usr/bin/select-screen-profile
 
 # Ensure that their keybindings are seeded