diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc
index 8af2b875..16d9c92d 100644
--- a/libtiff/Makefile.vc
+++ b/libtiff/Makefile.vc
@@ -1,4 +1,4 @@
-# $Id: Makefile.vc,v 1.4 2004-05-19 10:49:16 dron Exp $
+# $Id: Makefile.vc,v 1.5 2004-06-04 11:27:08 dron Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
 #
@@ -71,10 +71,13 @@ OBJ	= \
 
 all:	libtiff.lib libtiff.dll
 
-libtiff.lib:	$(OBJ)
+config.h:
+	copy config.h.vc config.h
+
+libtiff.lib:	config.h $(OBJ)
 	lib /nologo /out:libtiff.lib $(OBJ)
 
-libtiff.dll:	$(OBJ)
+libtiff.dll:	config.h $(OBJ)
 	link /nologo /dll /def:libtiff.def /out:libtiff.dll \
 	/implib:libtiff_i.lib $(OBJ) $(LIBS)
 	
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index 3087b93f..314223ec 100644
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
@@ -1,4 +1,4 @@
-/* $Id: tiffiop.h,v 1.16 2004-06-04 10:25:58 dron Exp $ */
+/* $Id: tiffiop.h,v 1.17 2004-06-04 11:27:08 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -30,11 +30,7 @@
  * ``Library-private'' definitions.
  */
 
-#if defined(_MSC_VER)
-# include "config.h.vc"
-#else
-# include "config.h"
-#endif
+#include "config.h"
 
 #if HAVE_FCNTL_H
 # include <fcntl.h>