diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7ef32dd0d0c6..ebfbf87d6268 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -65,11 +65,13 @@ makeoptions	CONF_CFLAGS=-fno-builtin  #Don't allow use of memcmp, etc.
 # allow that limit to grow to 1GB, and can be increased further
 # with changing the parameters.  MAXDSIZ is the maximum that the
 # limit can be set to, and the DFLDSIZ is the default value for
-# the limit.  You might want to set the default lower than the
-# max, and explicitly set the maximum with a shell command for processes
+# the limit.  MAXSSIZ is the maximum that the stack limit can be
+# set to.  You might want to set the default lower than the max, 
+# and explicitly set the maximum with a shell command for processes
 # that regularly exceed the limit like INND.
 #
 options 	MAXDSIZ="(1024UL*1024*1024)"
+options 	MAXSSIZ="(128UL*1024*1024)"
 options 	DFLDSIZ="(1024UL*1024*1024)"
 
 #
diff --git a/sys/conf/options b/sys/conf/options
index 3854bd7428ed..e7239a336f12 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -241,6 +241,7 @@ DEV_ATAPIFD		opt_ata.h
 # Resource limits.
 DFLDSIZ			opt_rlimit.h
 MAXDSIZ			opt_rlimit.h
+MAXSSIZ			opt_rlimit.h
 
 # Net stuff.
 ACCEPT_FILTER_DATA
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7ef32dd0d0c6..ebfbf87d6268 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -65,11 +65,13 @@ makeoptions	CONF_CFLAGS=-fno-builtin  #Don't allow use of memcmp, etc.
 # allow that limit to grow to 1GB, and can be increased further
 # with changing the parameters.  MAXDSIZ is the maximum that the
 # limit can be set to, and the DFLDSIZ is the default value for
-# the limit.  You might want to set the default lower than the
-# max, and explicitly set the maximum with a shell command for processes
+# the limit.  MAXSSIZ is the maximum that the stack limit can be
+# set to.  You might want to set the default lower than the max, 
+# and explicitly set the maximum with a shell command for processes
 # that regularly exceed the limit like INND.
 #
 options 	MAXDSIZ="(1024UL*1024*1024)"
+options 	MAXSSIZ="(128UL*1024*1024)"
 options 	DFLDSIZ="(1024UL*1024*1024)"
 
 #