diff --git a/ChangeLog b/ChangeLog
index 70645df..35a6965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4912,3 +4912,9 @@ Mon Nov  4 17:33:00 2002                        Michael Jennings (mej)
 
 Let's try that again, shall we?
 ----------------------------------------------------------------------
+Thu Nov  7 12:37:08 2002                        Michael Jennings (mej)
+
+Fixed typo in configure.in that caused ESCREEN to always be defined.
+
+Added support for /etc/screen/screenrc, as it is on gentoo.
+----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index f66fc8a..0ae882a 100644
--- a/configure.in
+++ b/configure.in
@@ -387,11 +387,7 @@ AC_ARG_ENABLE(etwin,
             fi], AC_MSG_RESULT(no)
 )
 
-if test ! -z "FOUND_$SCREEN" || ! -z "$FOUND_LIBTWIN"; then
-  AC_DEFINE(ESCREEN)
-fi
-
-if test ! -z "FOUND_$SCREEN" || ! -z "$FOUND_LIBTWIN"; then
+if test ! -z "$FOUND_SCREEN" || ! -z "$FOUND_LIBTWIN"; then
   AC_DEFINE(ESCREEN)
 fi
 
diff --git a/src/libscream.c b/src/libscream.c
index 1f0571d..81900e1 100644
--- a/src/libscream.c
+++ b/src/libscream.c
@@ -1374,10 +1374,12 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd)
         if (!(sess->sysrc = STRDUP(getenv("SCREENRC"))))
             goto fail;
     } else {
-        char *loc[] = { "/usr/local/etc/screenrc",      /* official */
-            "/etc/screenrc",    /* actual (on SuSE) */
-            "/usr/etc/screenrc",
-            "/opt/etc/screenrc"
+        char *loc[] = {
+          "/usr/local/etc/screenrc",      /* official */
+          "/etc/screenrc",    /* actual (on SuSE) */
+          "/usr/etc/screenrc",
+          "/opt/etc/screenrc",
+          "/etc/screen/screenrc"
         };
         int n, nloc = sizeof(loc) / sizeof(char *);