diff --git a/.cvsignore b/.cvsignore
index 5ea6703..43699b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tiff-v3.5.7.tar.gz
+tiff-v3.6.1.tar.gz
diff --git a/libtiff-v3.6.1-64bit.patch b/libtiff-v3.6.1-64bit.patch
new file mode 100644
index 0000000..5176db0
--- /dev/null
+++ b/libtiff-v3.6.1-64bit.patch
@@ -0,0 +1,11 @@
+--- tiff-v3.6.1/libtiff/tiff.h.64bit	2003-12-22 03:22:15.000000000 -0500
++++ tiff-v3.6.1/libtiff/tiff.h	2004-05-19 13:53:35.000000000 -0400
+@@ -79,7 +79,7 @@
+ typedef	unsigned char uint8;
+ typedef	short int16;
+ typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
+-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__)
++#if defined(__s390x__) || defined(__ia64__) || defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__)
+ typedef	int int32;
+ typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
+ #else
diff --git a/libtiff.spec b/libtiff.spec
index c3687e2..53e8c10 100644
--- a/libtiff.spec
+++ b/libtiff.spec
@@ -1,20 +1,17 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Name: libtiff
-Version: 3.5.7
-Release: 16.1
+Version: 3.6.1
+Release: 1
 Copyright: distributable
 Group: System Environment/Libraries
 Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz
-Patch0: tiff-v3.5-shlib.patch
-Patch1: libtiff-v3.4-arm.patch
-Patch2: libtiff-v3.5.4-codecs.patch
-Patch3: libtiff-v3.5.4-mandir.patch
-Patch4: libtiff-v3.5.5-buildroot.patch
-Patch5: libtiff-v3.5.5-64bit.patch
-Patch6: libtiff-v3.5.7-seek.patch
-Patch7: libtiff-v3.5.7-exit.patch
-Patch8: libtiff-v3.5.7-largefile.patch
-Patch9: libtiff-v3.5.7-makeflags.patch
+Patch0: libtiff-v3.6-shlib.patch
+Patch1: libtiff-v3.6.1-codecs.patch
+Patch2: libtiff-v3.5.4-mandir.patch
+Patch3: libtiff-v3.5.5-buildroot.patch
+Patch4: libtiff-v3.6.1-64bit.patch
+Patch5: libtiff-v3.5.7-largefile.patch
+Patch6: libtiff-v3.6.1-makeflags.patch
 URL: http://www.libtiff.org/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: zlib-devel zlib libjpeg-devel libjpeg
@@ -47,15 +44,11 @@ install the libtiff package.
 %prep
 %setup -q -n tiff-v%{version}
 %patch0 -p1 -b .shlib
-%patch1 -p1 -b .arm
-%patch2 -p1 -b .codecs
-%patch3 -p1 -b .mandir
-%patch4 -p1 -b .buildroot
-%patch5 -p1 -b .64bit
-%patch6 -p1 -b .seek
-%patch7 -p1 -b .exit
-%patch8 -p1 -b .largefile
-%patch9 -p1 -b .makeflags
+%patch1 -p1 -b .codecs
+%patch2 -p1 -b .mandir
+%patch3 -p1 -b .buildroot
+%patch4 -p1 -b .64bit
+%patch5 -p1 -b .largefile
 find . -type d -name CVS | xargs -r rm -frv
 
 %build
@@ -87,6 +80,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtiff.so*
 install -m755 libtiff/libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir}
 ln -sf libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir}/libtiff.so
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffgt.1
 
 %post -p /sbin/ldconfig
 
@@ -112,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed May 19 2004 Matthias Clasen <mclasen@redhat.com> 3.6.1-1
+- Upgrade to 3.6.1
+- Adjust patches
+- Don't install tiffgt man page  (#104864)
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 3149c06..c8e8b49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82243b5ae9b7c9e492aeebc501680990  tiff-v3.5.7.tar.gz
+b3f0ee7617593c2703755672fb1bfed3  tiff-v3.6.1.tar.gz