diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am
index 1a7a4944..56c5af3e 100644
--- a/libtiff/Makefile.am
+++ b/libtiff/Makefile.am
@@ -23,14 +23,14 @@
 
 # Process this file with automake to produce Makefile.in.
 
-LIBPORT = $(top_builddir)/port/libport.a
-
-EXTRA_DIST = Makefile.vc files.lst
+LIBPORT = -L$(top_builddir)/port -lport
 
 # Read list of source files and headers from the external file,
 # shared with other makefiles
 include files.lst
 
+EXTRA_DIST = Makefile.vc files.lst $(EXTRA_SRCS)
+
 libtiffincludedir = $(includedir)
 libtiffinclude_HEADERS = $(HDRS)
 noinst_HEADERS = $(EXTRA_HDRS)
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index b54b9d41..b4b4ee61 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -80,13 +80,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiffincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libtiff_la_LIBADD =
-am__objects_1 = tif_aux.lo tif_close.lo tif_codec.lo tif_compress.lo \
-	tif_color.lo tif_dir.lo tif_dirinfo.lo tif_dirread.lo \
+am__objects_1 = tif_aux.lo tif_close.lo tif_codec.lo tif_color.lo \
+	tif_compress.lo tif_dir.lo tif_dirinfo.lo tif_dirread.lo \
 	tif_dirwrite.lo tif_dumpmode.lo tif_error.lo tif_extension.lo \
-	tif_fax3.lo tif_fax3sm.lo tif_getimage.lo tif_jpeg.lo \
-	tif_flush.lo tif_luv.lo tif_lzw.lo tif_next.lo tif_ojpeg.lo \
+	tif_fax3.lo tif_fax3sm.lo tif_flush.lo tif_getimage.lo \
+	tif_jpeg.lo tif_luv.lo tif_lzw.lo tif_next.lo tif_ojpeg.lo \
 	tif_open.lo tif_packbits.lo tif_pixarlog.lo tif_predict.lo \
-	tif_print.lo tif_read.lo tif_swab.lo tif_strip.lo \
+	tif_print.lo tif_read.lo tif_strip.lo tif_swab.lo \
 	tif_thunder.lo tif_tile.lo tif_unix.lo tif_version.lo \
 	tif_warning.lo tif_write.lo tif_zip.lo
 am_libtiff_la_OBJECTS = $(am__objects_1)
@@ -94,7 +94,7 @@ libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
 mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/port/libport.a
+am__DEPENDENCIES_1 =
 mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -249,8 +249,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-LIBPORT = $(top_builddir)/port/libport.a
-EXTRA_DIST = Makefile.vc files.lst
+LIBPORT = -L$(top_builddir)/port -lport
 HDRS = \
 	tiff.h \
 	tiffio.h \
@@ -267,8 +266,8 @@ SRCS = \
 	tif_aux.c \
 	tif_close.c \
 	tif_codec.c \
-	tif_compress.c \
 	tif_color.c \
+	tif_compress.c \
 	tif_dir.c \
 	tif_dirinfo.c \
 	tif_dirread.c \
@@ -278,9 +277,9 @@ SRCS = \
 	tif_extension.c \
 	tif_fax3.c \
 	tif_fax3sm.c \
+	tif_flush.c \
 	tif_getimage.c \
 	tif_jpeg.c \
-	tif_flush.c \
 	tif_luv.c \
 	tif_lzw.c \
 	tif_next.c \
@@ -291,8 +290,8 @@ SRCS = \
 	tif_predict.c \
 	tif_print.c \
 	tif_read.c \
-	tif_swab.c \
 	tif_strip.c \
+	tif_swab.c \
 	tif_thunder.c \
 	tif_tile.c \
 	tif_unix.c \
@@ -301,9 +300,19 @@ SRCS = \
 	tif_write.c \
 	tif_zip.c
 
+EXTRA_SRCS = \
+	tif_acorn.c \
+	tif_apple.c \
+	tif_atari.c \
+	tif_msdos.c \
+	tif_next.c \
+	tif_win3.c \
+	tif_win32.c
+
 
 # Read list of source files and headers from the external file,
 # shared with other makefiles
+EXTRA_DIST = Makefile.vc files.lst $(EXTRA_SRCS)
 libtiffincludedir = $(includedir)
 libtiffinclude_HEADERS = $(HDRS)
 noinst_HEADERS = $(EXTRA_HDRS)
@@ -329,9 +338,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/files.lst $(am__configur
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libtiff/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libtiff/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  libtiff/Makefile
+	  $(AUTOMAKE) --gnu  libtiff/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/libtiff/files.lst b/libtiff/files.lst
index 6f692c7d..25944a99 100644
--- a/libtiff/files.lst
+++ b/libtiff/files.lst
@@ -14,8 +14,8 @@ SRCS = \
 	tif_aux.c \
 	tif_close.c \
 	tif_codec.c \
-	tif_compress.c \
 	tif_color.c \
+	tif_compress.c \
 	tif_dir.c \
 	tif_dirinfo.c \
 	tif_dirread.c \
@@ -25,9 +25,9 @@ SRCS = \
 	tif_extension.c \
 	tif_fax3.c \
 	tif_fax3sm.c \
+	tif_flush.c \
 	tif_getimage.c \
 	tif_jpeg.c \
-	tif_flush.c \
 	tif_luv.c \
 	tif_lzw.c \
 	tif_next.c \
@@ -38,8 +38,8 @@ SRCS = \
 	tif_predict.c \
 	tif_print.c \
 	tif_read.c \
-	tif_swab.c \
 	tif_strip.c \
+	tif_swab.c \
 	tif_thunder.c \
 	tif_tile.c \
 	tif_unix.c \
@@ -48,3 +48,11 @@ SRCS = \
 	tif_write.c \
 	tif_zip.c
 
+EXTRA_SRCS = \
+	tif_acorn.c \
+	tif_apple.c \
+	tif_atari.c \
+	tif_msdos.c \
+	tif_next.c \
+	tif_win3.c \
+	tif_win32.c