diff --git a/CHANGES b/CHANGES
index 6ccec1c2..0c04a547 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 DD MMM YYYY - 2.9.3 - To be released
 ------------------------------------
 
+ * Enable optimization for large stream input by default on IIS
+   [Issue #1299 - @victorhora, @zimmerle]
  * Allow 0 length JSON requests.
    [Issue #1822 - @allanbomsft, @zimmerle, @victorhora, @marcstern]
  * Include unanmed JSON values in unnamed ARGS
diff --git a/iis/Makefile.win b/iis/Makefile.win
index 8c2cdbd7..d07f795a 100644
--- a/iis/Makefile.win
+++ b/iis/Makefile.win
@@ -10,12 +10,12 @@
 LIBS = $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
-       $(CURL)\libcurl.lib \
+       $(CURL)\libcurl.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        "kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \
        "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \
        "iphlpapi.lib"
-#       $(SSDEEP)\fuzzy.lib \
+#       $(SSDEEP)\fuzzy.lib \
 ###########################################################################
 ###########################################################################
 
@@ -24,12 +24,12 @@ LINK = link.exe
 
 MT = mt
 
-DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWITH_YAJL -DWIN32 -DWINNT -Dinline=APR_INLINE -DAP_DECLARE_STATIC -D_MBCS -D$(VERSION)
+DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWITH_YAJL -DWIN32 -DWINNT -Dinline=APR_INLINE -DAP_DECLARE_STATIC -D_MBCS -D$(VERSION)
 
 DLL = ModSecurityIIS.dll
 
 INCLUDES = -I. -I.. \
-	   -I$(YAJL)\.. \
+	   -I$(YAJL)\.. \
            -I$(PCRE)\include -I$(PCRE) \
            -I$(LIBXML2)\include \
            -I$(CURL)\include -I$(CURL) \
@@ -37,10 +37,10 @@ INCLUDES = -I. -I.. \
            -I..\apache2 \
            -I..\standalone
 
-# Enables support for SecRemoteRules and external resources.
-DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
-
-#	   -I$(SSDEEP) \
+# Enables support for SecRemoteRules, external resources and enable optimization for large stream input by default on IIS.
+DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES -DMSC_LARGE_STREAM_INPUT
+
+#	   -I$(SSDEEP) \
 # Lua is optional
 !IF "$(LUA)" != ""
 LIBS = $(LIBS) $(LUA)\lua5.1.lib
@@ -54,16 +54,16 @@ LIBS = $(LIBS) $(YAJL)\lib\yajl.lib
 DEFS=$(DEFS) -DWITH_YAJL
 INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \
 !ENDIF
-
+
 # ssdeep is optional
 # !IF "$(SSDEEP)" != ""
 # LIBS = $(LIBS) $(SSDEEP)\fuzzy.lib
 # DEFS=$(DEFS) -DWITH_SSDEEP
 # INCLUDES = $(INCLUDES) -I$(SSDEEP)\include -I$(SSDEEP) \
 # !ENDIF
-
-
-
+
+
+
 
 CFLAGS= -MD /Zi $(INCLUDES) $(DEFS)
 
@@ -75,10 +75,10 @@ OBJS1 = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_unicode.obj acmp.obj msc_lua.obj \
        msc_release.obj msc_crypt.obj msc_tree.obj \
-       msc_status_engine.obj \
+       msc_status_engine.obj \
        msc_json.obj \
-       msc_remote_rules.obj 
-
+       msc_remote_rules.obj 
+
 OBJS2 = api.obj buckets.obj config.obj filters.obj hooks.obj regex.obj server.obj
 OBJS3 = main.obj moduleconfig.obj mymodule.obj
 OBJS4 = libinjection_html5.obj \