diff --git a/ChangeLog b/ChangeLog
index 426f628..5639593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+nenolod     2007/03/05 18:58:38 UTC	(20070305-3251)
+  Log:
+  - add config option for setting max_clients.
+  
+
+  Changes:	Modified:
+  +5 -0		trunk/doc/example.conf (File Modified) 
+  +5 -0		trunk/doc/reference.conf (File Modified) 
+  +2 -0		trunk/include/s_conf.h (File Modified) 
+  +1 -1		trunk/src/ircd.c (File Modified) 
+  +2 -0		trunk/src/newconf.c (File Modified) 
+  +2 -1		trunk/src/s_conf.c (File Modified) 
+
+
 nenolod     2007/03/05 18:51:17 UTC	(20070305-3249)
   Log:
   - remove get_maxrss() and all of that insecure and unsafe nonsense
diff --git a/include/serno.h b/include/serno.h
index c1985d5..56f9b08 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070305-3249"
+#define SERNO "20070305-3251"
diff --git a/modules/m_set.c b/modules/m_set.c
index 380350d..b05a8ba 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_set.c 3161 2007-01-25 07:23:01Z nenolod $
+ *  $Id: m_set.c 3253 2007-03-05 19:01:05Z nenolod $
  */
 
 /* rewritten by jdc */
@@ -52,7 +52,7 @@ struct Message set_msgtab = {
 };
 
 mapi_clist_av1 set_clist[] = { &set_msgtab, NULL };
-DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3253 $");
 
 /* Structure used for the SET table itself */
 struct SetStruct
@@ -246,13 +246,6 @@ quote_max(struct Client *source_p, int newval)
 {
 	if(newval > 0)
 	{
-		if(newval > MASTER_MAX)
-		{
-			sendto_one_notice(source_p, ":You cannot set MAXCLIENTS to > MASTER_MAX (%d)",
-				   MASTER_MAX);
-			return;
-		}
-
 		if(newval < 32)
 		{
 			sendto_one_notice(source_p, ":You cannot set MAXCLIENTS to < 32 (%d:%d)",