diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index f44831c..60a6624 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,4 +1,5 @@
 
 all:
-	cl -nologo -c -MT -O2 -D MD5_ASM -D L_ENDIAN md5_dgst.c md5_one.c
+	cl -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN	\
+		md5_dgst.c md5_one.c
 	link -lib -out:md5.lib md5_dgst.obj md5_one.obj asm/m-win32.obj
diff --git a/auto/make b/auto/make
index fa1354f..c210d7e 100644
--- a/auto/make
+++ b/auto/make
@@ -11,6 +11,11 @@
 
 HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE"
 
+if [ $HTTP_REWRITE = YES ]; then
+    HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
+fi
+
 if [ $HTTP_GZIP = YES ]; then
     HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_GZIP_FILTER_MODULE"
     HTTP_SRCS="$HTTP_SRCS $HTTP_GZIP_SRCS"
diff --git a/auto/options b/auto/options
index 1eb45a2..2356a76 100644
--- a/auto/options
+++ b/auto/options
@@ -6,6 +6,7 @@
 
 TEST_BUILD_DEVPOLL=NO
 
+HTTP_REWRITE=YES
 HTTP_GZIP=YES
 HTTP_PROXY=YES
 
@@ -34,6 +35,7 @@
 
         --builddir=*)                    OBJS="$value"              ;;
 
+        --without-http_rewrite_module)   HTTP_REWRITE=NO            ;;
         --without-http_gzip_module)      HTTP_GZIP=NO               ;;
         --without-http_proxy_module)     HTTP_PROXY=NO              ;;
 
diff --git a/auto/sources b/auto/sources
index b2eec44..1b3ffda 100644
--- a/auto/sources
+++ b/auto/sources
@@ -193,6 +193,10 @@
             src/http/modules/ngx_http_not_modified_filter.c"
 
 
+HTTP_REWRITE_MODULE=ngx_http_rewrite_module
+HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c
+
+
 HTTP_GZIP_FILTER_MODULE=ngx_http_gzip_filter_module
 HTTP_GZIP_SRCS=src/http/modules/ngx_http_gzip_filter.c
 HTTP_GZIP_UNIX_LIBS=-lz