diff --git a/CHANGES b/CHANGES
index 23cc304..4a59ceb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,6 @@
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
-
 2009-07-05 (2.8.7rel.1)
 * update metrics for 2.8.7 release.
 * fix ifdef'ing for cfg_bad_html (report by Gabor Z Papp) -TD
@@ -244,6 +243,13 @@ Changes since Lynx 2.8 release
 * update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD
 * update config.guess (2008-04-14), config.sub (2008-06-16)
 
+2008-10-26
+* modify patch for CVE-2005-2929 to prompt user before executing command via
+  a lynxcgi link even in advanced mode, as the actual URL may not be shown but
+  hidden behind an HTTP redirect
+* set TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default
+  [CVE-2008-4690]
+
 2008-09-21 (2.8.7dev.10)
 * remove rw.po, since the translation project no longer supplies it -TD
 * implement "readonly" attribute for TEXTAREA and TEXT fields -TD
diff --git a/lynx.cfg b/lynx.cfg
index acdfae1..e83a4bf 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1081,7 +1081,7 @@ CHARACTER_SET:utf-8
 #
 # The default TRUSTED_LYNXCGI rule is "none".
 #
-#TRUSTED_LYNXCGI:none
+TRUSTED_LYNXCGI:none
 
 
 .h2 LYNXCGI_ENVIRONMENT
diff --git a/src/LYCgi.c b/src/LYCgi.c
index cfaf18f..aceed8d 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -167,7 +167,7 @@ static BOOL can_exec_cgi(const char *linktext, const char *linkargs)
     if (!exec_ok(HTLoadedDocumentURL(), linktext, CGI_PATH)) {
 	/* exec_ok gives out msg. */
 	result = FALSE;
-    } else {
+    } else if (user_mode < ADVANCED_MODE) {
 	StrAllocCopy(command, linktext);
 	if (non_empty(linkargs)) {
 	    HTSprintf(&command, " %s", linkargs);