diff --git a/Makefile.am b/Makefile.am
index 3c53d357..fd5d0574 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,13 @@ EXTRA_DIST = \
 	COPYRIGHT \
 	ChangeLog \
 	HOWTO-RELEASE \
+	Makefile.vc \
 	README \
 	RELEASE-DATE \
 	TODO \
 	VERSION \
-	autogen.sh
+	autogen.sh \
+	nmake.opt
 
 SUBDIRS = port libtiff tools contrib man html
 
diff --git a/Makefile.in b/Makefile.in
index b23aaf7a..47ac9509 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -200,11 +200,13 @@ EXTRA_DIST = \
 	COPYRIGHT \
 	ChangeLog \
 	HOWTO-RELEASE \
+	Makefile.vc \
 	README \
 	RELEASE-DATE \
 	TODO \
 	VERSION \
-	autogen.sh
+	autogen.sh \
+	nmake.opt
 
 SUBDIRS = port libtiff tools contrib man html
 all: all-recursive
diff --git a/Makefile.vc b/Makefile.vc
new file mode 100644
index 00000000..3cecd84a
--- /dev/null
+++ b/Makefile.vc
@@ -0,0 +1,35 @@
+#
+#	Simple MS VC++ Makefile
+#
+#	To build:
+#       C:\libtiff\tools> nmake /f makefile.vc 
+
+!INCLUDE ..\nmake.opt
+
+TARGETS	=	tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
+		fax2ps.exe gif2tiff.exe pal2rgb.exe ppm2tiff.exe \
+		rgb2ycbcr.exe thumbnail.exe ras2tiff.exe raw2tiff.exe \
+		tiff2bw.exe tiff2rgba.exe tiff2pdf.exe tiff2ps.exe \
+		tiffcmp.exe tiffdither.exe tiffmedian.exe tiffsplit.exe 
+
+EXTRA_OBJ 	= 	strcasecmp.obj getopt.obj
+
+INCL		= 	-I..\libtiff
+LIBS		=	$(LIBS) ..\libtiff\libtiff.lib
+
+default:	$(EXTRA_OBJ) $(TARGETS)
+
+.c.exe:
+	$(CC) $(CFLAGS) $*.c $(EXTRA_OBJ) $(LIBS)
+
+tiffgt.exe:
+	$(CC) $(CFLAGS) tiffgt.c $(EXTRA_OBJ) $(LIBS)
+
+getopt.obj:	..\port\getopt.c
+	$(CC) /c $(CFLAGS) ..\port\getopt.c
+
+strcasecmp.obj:	..\port\strcasecmp.c
+	$(CC) /c $(CFLAGS) ..\port\strcasecmp.c
+
+clean:
+	-del *.exe *.obj
diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc
index d2a54b11..08e84ac9 100644
--- a/libtiff/Makefile.vc
+++ b/libtiff/Makefile.vc
@@ -5,36 +5,9 @@
 #       C:\libtiff\libtiff> nmake /f makefile.vc all
 #
 
-# 
-# Select _CONSOLE to build a library which reports errors to stderr, or
-# _WINDOWED to build such that errors are reported via MessageBox().
-#
-WINMODE = -DTIF_PLATFORM_CONSOLE
-#WINMODE = -DTIF_PLATFORM_WINDOWED
+!INCLUDE ..\nmake.opt
 
-# Uncomment and edit following lines to enable JPEG support
-#JPEG_SUPPORT	= 1
-#JPEGDIR 	= d:/projects/jpeg-6b
-#JPEG_LIB 	= $(JPEGDIR)/Release/jpeg.lib
-
-# Uncomment and edit following lines to enable ZIP support
-# (required for Deflate compression)
-#ZIP_SUPPORT	= 1
-#ZLIBDIR 	= d:/projects/zlib-1.2.1
-#ZLIB_LIB 	= $(ZLIBDIR)/zlib.lib
-
-CC      	= cl
-INCL		= -I.
-LIBS    	=
-EXTRAFLAGS	=
-
-!IFDEF JPEG_SUPPORT
-INCL		= $(INCL) -I$(JPEGDIR)
-LIBS		= $(LIBS) $(JPEG_LIB)
-EXTRAFLAGS	= $(EXTRAFLAGS) -DJPEG_SUPPORT
-!ENDIF
-
-CFLAGS  = /nologo /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS)
+INCL	= -I.
 
 OBJ	= \
 	tif_aux.obj \
@@ -77,24 +50,22 @@ OBJ	= \
 VERSION	= ..\VERSION
 ALPHA = ..\dist\tiff.alpha
 
-default:	libtiff.lib
-
 all:	libtiff.lib libtiff.dll
 
 libtiff.lib:	tiffvers.h $(OBJ)
-	lib /out:libtiff.lib $(OBJ)
+	lib /nologo /out:libtiff.lib $(OBJ)
 
 libtiff.dll:	$(OBJ)
-	link /dll /def:libtiff.def /out:libtiff.dll /implib:libtiff_i.lib \
-		$(OBJ) $(LIBS)
+	link /nologo /dll /def:libtiff.def /out:libtiff.dll \
+	/implib:libtiff_i.lib $(OBJ) $(LIBS)
 	
 tiffvers.h:	$(VERSION) mkversion.c
-	$(CC) mkversion.c 
+	$(CC) $(CFLAGS) mkversion.c 
 	if exist tiffvers.h del tiffvers.h
 	.\mkversion.exe -v $(VERSION) tiffvers.h
 
 clean:
-	del *.obj *.lib libtiff.dll
+	-del *.obj *.lib *.dll *.exe
 
 tif_version.obj:	tiffvers.h
 
diff --git a/nmake.opt b/nmake.opt
new file mode 100644
index 00000000..bd76a002
--- /dev/null
+++ b/nmake.opt
@@ -0,0 +1,51 @@
+# Compile time parameters for MS Visual C++ compiler.
+# You may edit this file to specify building options.
+
+# 
+# Select _CONSOLE to build a library which reports errors to stderr, or
+# _WINDOWED to build such that errors are reported via MessageBox().
+#
+WINMODE = -DTIF_PLATFORM_CONSOLE
+#WINMODE = -DTIF_PLATFORM_WINDOWED
+
+#
+# Uncomment and edit following lines to enable JPEG support.
+#
+#JPEG_SUPPORT	= 1
+#JPEGDIR 	= d:/projects/jpeg-6b
+#JPEG_LIB 	= $(JPEGDIR)/Release/jpeg.lib
+
+#
+# Uncomment following lines to enable Old JPEG support
+# (patched IJG JPEG library required, read the contrib\ojpeg\README first).
+#
+#OJPEG_SUPPORT = 1
+
+#
+# Uncomment and edit following lines to enable ZIP support
+# (required for Deflate compression)
+#
+#ZIP_SUPPORT	= 1
+#ZLIBDIR 	= d:/projects/zlib-1.2.1
+#ZLIB_LIB 	= $(ZLIBDIR)/zlib.lib
+
+#
+# There is nothing to edit below this line normally.
+#
+
+MAKE	=	nmake /nologo
+CC	=	cl /nologo
+
+CFLAGS  = /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS)
+EXTRAFLAGS	=
+LIBS		=
+
+!IFDEF JPEG_SUPPORT
+LIBS		= $(LIBS) $(JPEG_LIB)
+EXTRAFLAGS	= $(EXTRAFLAGS) -DJPEG_SUPPORT
+
+!IFDEF OJPEG_SUPPORT
+EXTRAFLAGS	= $(EXTRAFLAGS) -DOJPEG_SUPPORT
+!ENDIF
+!ENDIF
+
diff --git a/tools/Makefile.vc b/tools/Makefile.vc
index a19132d6..3cecd84a 100644
--- a/tools/Makefile.vc
+++ b/tools/Makefile.vc
@@ -3,17 +3,8 @@
 #
 #	To build:
 #       C:\libtiff\tools> nmake /f makefile.vc 
-#
-# Uncomment and edit following lines to enable JPEG support
-#JPEG_SUPPORT	= 1
-#JPEGDIR 	= d:/projects/jpeg-6b
-#JPEG_LIB 	= $(JPEGDIR)/Release/jpeg.lib
 
-# Uncomment and edit following lines to enable ZIP support
-# (required for Deflate compression)
-#ZIP_SUPPORT	= 1
-#ZLIBDIR 	= d:/projects/zlib-1.2.1
-#ZLIB_LIB 	= $(ZLIBDIR)/zlib.lib
+!INCLUDE ..\nmake.opt
 
 TARGETS	=	tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
 		fax2ps.exe gif2tiff.exe pal2rgb.exe ppm2tiff.exe \
@@ -23,15 +14,8 @@ TARGETS	=	tiffcp.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
 
 EXTRA_OBJ 	= 	strcasecmp.obj getopt.obj
 
-LIBS		=	..\libtiff\libtiff.lib
-EXTRAFLAGS	=
-
-!IFDEF JPEG_SUPPORT
-LIBS		= $(LIBS) $(JPEG_LIB)
-EXTRAFLAGS	= $(EXTRAFLAGS) -DJPEG_SUPPORT
-!ENDIF
-
-CFLAGS 	=	/nologo -I..\libtiff /D_WINDOWS $(EXTRAFLAGS)
+INCL		= 	-I..\libtiff
+LIBS		=	$(LIBS) ..\libtiff\libtiff.lib
 
 default:	$(EXTRA_OBJ) $(TARGETS)
 
@@ -48,4 +32,4 @@ strcasecmp.obj:	..\port\strcasecmp.c
 	$(CC) /c $(CFLAGS) ..\port\strcasecmp.c
 
 clean:
-	del *.obj *.exe
+	-del *.exe *.obj