diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 138a09786..8ce4078bd 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,9 +9,9 @@
  * Administration - Site Preferences
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
- * $Revision: 1.32 $
- * $Date: 2009-07-18 10:17:56 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.33 $
+ * $Date: 2009-08-20 11:38:24 $
+ * $Author: e107coders $
  *
 */
 require_once ("../class2.php");
@@ -77,6 +77,8 @@ if(isset($_POST['updateprefs']))
 					);
 
 	$pref['post_html'] = intval($_POST['post_html']);			// This ensures the setting is reflected in set text
+	
+	$_POST['membersonly_exceptions'] = explode("\n",$_POST['membersonly_exceptions']);
 
 	$prefChanges = array();
 	foreach($_POST as $key => $value)
@@ -172,6 +174,8 @@ while($file = readdir($handle))
 }
 closedir($handle);
 
+$pref['membersonly_exceptions'] = implode("\n",$pref['membersonly_exceptions']);
+
 $text = "
 <div id='core-prefs'>
 	<form class='admin-menu' method='post' action='".e_SELF."'>
@@ -540,6 +544,13 @@ $text .= "
 							<div class='field-help'>".PRFLAN_59."</div>
 						</td>
 					</tr>
+                    <tr>
+						<td class='label'>".PRFLAN_206."</td>
+						<td class='control'>
+							".$frm->textarea('membersonly_exceptions', $pref['membersonly_exceptions'], 3, 1)."
+							<div class='field-help'>".PRFLAN_207."</div>
+						</td>
+					</tr>
                		<tr>
 						<td class='label'>".PRFLAN_197.": </td>
 						<td class='control'>
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index cc0f4d177..e6057c1b5 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -12,8 +12,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_prefs.php,v $
-|     $Revision: 1.20 $
-|     $Date: 2009-07-09 02:47:13 $
+|     $Revision: 1.21 $
+|     $Date: 2009-08-20 11:38:24 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -220,5 +220,8 @@ define("PRFLAN_202", "Email and Password");
 define("PRFLAN_203", "Username/Email and Password");
 define("PRFLAN_204", "Separate plugins into their own menu.");
 define("PRFLAN_205", "If enabled, plugins will be displayed in their own navigation menu, similar to e107 v0.7 and before.");
+define("PRFLAN_206", "Members-only URL exceptions");
+define("PRFLAN_207", "Membersonly-mode with be disabled for URLs that match any of the terms in this list. One per line.");
+
 
 ?>
\ No newline at end of file