diff --git a/src/warden-server/etc/warden-server.conf b/src/warden-server/etc/warden-server.conf
index 4d9ff78c9ad5823b7db7abf08e27e2259e6677e7..f7ed95041df55289b3908b8e2172d2d32c2f9eba 100644
--- a/src/warden-server/etc/warden-server.conf
+++ b/src/warden-server/etc/warden-server.conf
@@ -32,3 +32,8 @@ $DB_PASS = "";
 #-------------------------------------------------------------------------------
 $DB_HOST = "localhost";
 
+#-------------------------------------------------------------------------------
+# MAX_EVENT_LIMIT - maximum number of events that can be downloaded from
+#                   Warden server in a single getNewEvents client function call
+#-------------------------------------------------------------------------------
+$MAX_EVENT_LIMIT = "1000000";
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 0ddc9154bec41c34d947119440656dda211ea243..cd84921cc59c521264cb4153c16c6bfe92960139 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -221,6 +221,12 @@ make_server_conf()
 # DB_HOST - what IP address to listen on of Warden server
 #-------------------------------------------------------------------------------
 \$DB_HOST            = \"localhost\";
+
+#-------------------------------------------------------------------------------
+# MAX_EVENT_LIMIT - maximum number of events that can be downloaded from
+#                   Warden server in a single getNewEvents client function call
+#-------------------------------------------------------------------------------
+\$MAX_EVENT_LIMIT = \"1000000\";
 " > $server_conf 2> $err; ret_val=`echo $?`
 
 	if [ $ret_val -eq 0 ]; then