diff -Nurd pcre-ocaml-release-6.1.0/lib/make_msvc.bat pcre-ocaml-release-6.1.0.new/lib/make_msvc.bat
--- pcre-ocaml-release-6.1.0/lib/make_msvc.bat	2010-04-01 18:53:49.000000000 +0000
+++ pcre-ocaml-release-6.1.0.new/lib/make_msvc.bat	2010-10-22 08:00:07.000000000 +0000
@@ -5,9 +5,9 @@
 set INSTALLDIR=%OCAMLLIB%\pcre
 set STUBDIR=%OCAMLLIB%\stublibs
 
-set PCRE_H=C:\pcre
+set PCRE_H=C:\pcre\pcre-7.7\include
 REM Full path of the pcre C lib:
-set PCRE_LIB="C:\pcre"\libpcre.lib
+set PCRE_LIB=C:\pcre\pcre-7.7\lib\libpcre.lib
 
 set OCAMLC=ocamlc
 set OCAMLOPT=ocamlopt
@@ -28,26 +28,30 @@
 
 %OCAMLC% -c pcre.mli
 @echo --- Byte code library ---
-cl /nologo /Ox /MT  /DPCRE_STATIC /I "%OCAMLLIB%" /I "%PCRE_H%" /c pcre_stubs.c /Fopcre_stubs.s.obj
-lib /nologo /out:libpcre_stubs.lib pcre_stubs.s.obj
+REM cl /nologo /Ox /MT  /DPCRE_STATIC /I "%OCAMLLIB%" /I "%PCRE_H%" /c pcre_stubs.c /Fopcre_stubs.s.obj
+REM lib /nologo /out:libpcre_stubs.lib pcre_stubs.s.obj
+%OCAMLC% -I "%PCRE_H%" -ccopt /DPCRE_STATIC pcre_stubs.c
+ocamlmklib -o pcre_stubs pcre_stubs.obj
 
 @REM cl /nologo /Ox /MD /DCAML_DLL /I "%OCAMLLIB%" /I "%PCRE_H%" /c pcre_stubs.c /Fopcre_stubs.d.obj
 @REM link /nologo /dll /out:dllpcre_stubs.dll /def:pcre_stubs.DEF pcre_stubs.d.obj "%OCAMLLIB%"\ocamlrun.lib %PCRE_LIB%
 @REM copy dllpcre_stubs.dll "%STUBDIR%" >NUL
 
-%OCAMLC% -custom -a -o pcre.cma pcre.ml pcre.mli -cclib %PCRE_LIB% -cclib -lpcre_stubs
+%OCAMLC% -custom -a -o pcre.cma pcre.ml pcre.mli -cclib "%PCRE_LIB%" -cclib -lpcre_stubs
 
 @echo --- Native code library ---
-%OCAMLOPT% -a -o pcre.cmxa pcre.ml pcre.mli -cclib %PCRE_LIB% -cclib -lpcre_stubs
+%OCAMLOPT% -a -o pcre.cmxa pcre.ml pcre.mli -cclib "%PCRE_LIB%" -cclib -lpcre_stubs
 
 @echo --- Installation ---
-mkdir "%INSTALLDIR%"
-copy libpcre_stubs.lib "%INSTALLDIR%" >NUL
-copy pcre.mli       "%INSTALLDIR%"  >NUL
-copy pcre.cmi       "%INSTALLDIR%"  >NUL
-copy pcre.cma       "%INSTALLDIR%"  >NUL
-copy pcre.cmxa      "%INSTALLDIR%"  >NUL
-copy pcre_stubs.lib "%INSTALLDIR%"  >NUL
-copy pcre.lib       "%INSTALLDIR%"  >NUL
+ocamlfind install pcre META libpcre_stubs.lib pcre.mli pcre.cmi pcre.cma pcre.cmxa pcre.lib
+REM mkdir "%INSTALLDIR%" 
+REM copy libpcre_stubs.lib "%INSTALLDIR%" >NUL
+REM copy pcre.mli       "%INSTALLDIR%"  >NUL
+REM copy pcre.cmi       "%INSTALLDIR%"  >NUL
+REM copy pcre.cma       "%INSTALLDIR%"  >NUL
+REM copy pcre.cmxa      "%INSTALLDIR%"  >NUL
+REM copy pcre_stubs.lib "%INSTALLDIR%"  >NUL
+REM copy pcre.lib       "%INSTALLDIR%"  >NUL
+REM copy META           "%INSTALLDIR%"  >NUL
 
 @prompt $P$G$S
diff -Nurd pcre-ocaml-release-6.1.0/lib/pcre_stubs.c pcre-ocaml-release-6.1.0.new/lib/pcre_stubs.c
--- pcre-ocaml-release-6.1.0/lib/pcre_stubs.c	2010-04-01 18:53:49.000000000 +0000
+++ pcre-ocaml-release-6.1.0.new/lib/pcre_stubs.c	2010-10-22 08:00:07.000000000 +0000
@@ -34,6 +34,10 @@
 # define inline
 #endif
 
+#if defined(_WIN32)
+#define snprintf _snprintf
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>