diff --git a/screen b/screen
index 1d55e27a..8b3fd673 100755
--- a/screen
+++ b/screen
@@ -30,8 +30,13 @@
 # Ensure that the user's .screenrc at least exists
 [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
 
+##########################################################################
+# The following hacks should be removed when Jaunty goes Beta
 # Prevent recursion; .screenrc should no longer source .screenrc-profile
 sed -i '/^source .*\.screenrc-profile$/d' $HOME/.screenrc
+# .screenrc-windows should no longer reference screen-profiles-helper
+sed -i 's/screen-profiles-helper/screen-profiles/' $HOME/.screenrc-windows
+##########################################################################
 
 # Now let's execute screen!
 exec /usr/bin/screen.real -c "$HOME/.screenrc-profile" "$@"