diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 8eeec798c7f..fd7f5962b8a 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2002/10/27 00:03:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2003/12/23 23:45:41 brad Exp $
 
 COMMENT=	"tools and library routines for working with TIFF images"
 
-DISTNAME=	tiff-v3.5.7
-PKGNAME=	tiff-3.5.7
+VERSION=	3.6.0
+DISTNAME=	tiff-v${VERSION}
+PKGNAME=	tiff-${VERSION}
 CATEGORIES=	graphics
 
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index a854034527c..bde6759887d 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (tiff-v3.5.7.tar.gz) = 82243b5ae9b7c9e492aeebc501680990
-RMD160 (tiff-v3.5.7.tar.gz) = 4654d21ba2ad8ecf54e54f5e6a5ace4df1410b38
-SHA1 (tiff-v3.5.7.tar.gz) = a4c3e27b6625ee9daec7c7c35ec3dedf59c14ca7
+MD5 (tiff-v3.6.0.tar.gz) = ec0ca41f0e5c7cb4aa605fab9ddbaef9
+RMD160 (tiff-v3.6.0.tar.gz) = 104e618bb1683d2b0dc4ab1defb169664d36202c
+SHA1 (tiff-v3.6.0.tar.gz) = 45cc110dcd825bd42dade57ace402e4dafeacebc
diff --git a/graphics/tiff/patches/patch-configure b/graphics/tiff/patches/patch-configure
deleted file mode 100644
index e33f3571b2e..00000000000
--- a/graphics/tiff/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Thu Nov 15 12:21:05 2001
-+++ configure	Wed Jan 23 20:46:16 2002
-@@ -1179,8 +1179,12 @@ if [ "$DSO" = auto ]; then
- 	DSO=GNULD
- 	;;
-     *-openbsd*)
--	DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR}
--	LIBCOPTS='-fpic'
-+	DSOSUF=so.${DIST_MAJOR}${DIST_MINOR}.${DIST_POINT}
-+	if [ "`uname -m`" = "sparc64" ]; then
-+	  LIBCOPTS='-fPIC'
-+	else
-+	  LIBCOPTS='-fpic'
-+	fi
- 	TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
- 	case "$TARGET" in
- 	   *-openbsd[01].* | *-openbsd2.[0-7] | *-openbsd2.[0-7].*)
diff --git a/graphics/tiff/patches/patch-libtiff_Makefile_in b/graphics/tiff/patches/patch-libtiff_Makefile_in
deleted file mode 100644
index 26bcb3489b9..00000000000
--- a/graphics/tiff/patches/patch-libtiff_Makefile_in
+++ /dev/null
@@ -1,22 +0,0 @@
---- libtiff/Makefile.in.orig	Sun Sep  9 11:56:04 2001
-+++ libtiff/Makefile.in	Tue Dec  4 00:01:22 2001
-@@ -364,15 +364,15 @@ installPrivateHdrs: ${INCS_PRIVATE}
- 
- installDSO: @DSO@dso
- 	if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then			\
--	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
--		-O libtiff.@DSOSUF_VERSION@;				\
-+	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F		\
-+		${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF_VERSION@;	\
- 	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
- 		-lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@;	\
- 	    ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@	\
- 		-lns libtiff.@DSOSUF@ -O libtiff.so;			\
- 	else								\
--	    ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@	\
--		-O libtiff.@DSOSUF@;					\
-+	    ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F		\
-+		${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF@;		\
- 	fi
- 
- install: all installHdrs
diff --git a/graphics/tiff/patches/patch-libtiff_tif_fax3_c b/graphics/tiff/patches/patch-libtiff_tif_fax3_c
deleted file mode 100644
index 34ed427aca1..00000000000
--- a/graphics/tiff/patches/patch-libtiff_tif_fax3_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libtiff_tif_fax3_c,v 1.1 2002/01/19 09:34:42 brad Exp $
---- libtiff/tif_fax3.c.orig	Tue Dec  4 10:20:46 2001
-+++ libtiff/tif_fax3.c	Tue Dec  4 10:21:16 2001
-@@ -315,7 +315,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, ts
-  * this is <8 bytes.  We optimize the code here to reflect the
-  * machine characteristics.
-  */
--#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__)
-+#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__)
- #define FILL(n, cp)							    \
-     switch (n) {							    \
-     case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\
diff --git a/graphics/tiff/patches/patch-libtiff_tiff_h b/graphics/tiff/patches/patch-libtiff_tiff_h
deleted file mode 100644
index 37ff8cca835..00000000000
--- a/graphics/tiff/patches/patch-libtiff_tiff_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libtiff_tiff_h,v 1.1 2002/01/19 09:34:42 brad Exp $
---- libtiff/tiff.h.orig	Tue Dec  4 10:19:32 2001
-+++ libtiff/tiff.h	Tue Dec  4 10:20:07 2001
-@@ -79,7 +79,7 @@ typedef	char int8;
- 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__)
-+#if 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/graphics/tiff/patches/patch-man_Makefile_in b/graphics/tiff/patches/patch-man_Makefile_in
index b86a5955660..ef848c70a74 100644
--- a/graphics/tiff/patches/patch-man_Makefile_in
+++ b/graphics/tiff/patches/patch-man_Makefile_in
@@ -1,5 +1,6 @@
---- man/Makefile.in.orig	Wed Sep 26 13:32:24 2001
-+++ man/Makefile.in	Tue Dec  4 09:54:49 2001
+$OpenBSD: patch-man_Makefile_in,v 1.3 2003/12/23 23:45:41 brad Exp $
+--- man/Makefile.in.orig	2003-10-04 07:43:16.000000000 -0400
++++ man/Makefile.in	2003-12-13 02:34:58.000000000 -0500
 @@ -42,6 +42,7 @@ ECHO	= echo
  SED	= sed
  MV	= mv
@@ -17,7 +18,7 @@
  
  MANTOOLS=\
  	apps/fax2tiff.1 \
-@@ -279,61 +280,61 @@ lib/TIFFstrip.3t::	${SRCDIR}/TIFFstrip.3
+@@ -286,65 +287,65 @@ lib/TIFFstrip.3t::	${SRCDIR}/TIFFstrip.3
  lib/TIFFswab.3t::	${SRCDIR}/TIFFswab.3t;			${MANCVT}
  lib/TIFFtile.3t::	${SRCDIR}/TIFFtile.3t;			${MANCVT}
  
@@ -43,10 +44,12 @@
 -lib/TIFFLastDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@
 -lib/TIFFReverseBits.3t:;	${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@
 -lib/TIFFRewriteDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFWriteDirectory.3t" > $@
+-lib/TIFFCheckpointDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFWriteDirectory.3t" > $@
 -lib/TIFFRGBAImageOK.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
 -lib/TIFFRGBAImageBegin.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
 -lib/TIFFRGBAImageGet.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
 -lib/TIFFRGBAImageEnd.3t:;	${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@
+-lib/TIFFReadRGBAImageOriented.3t:;	${ECHO} ".so ${MANDIR}TIFFReadRGBAImage.3t" > $@
 -lib/TIFFSetErrorHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFError.3t" > $@
 -lib/TIFFSetSubDirectory.3t:;	${ECHO} ".so ${MANDIR}TIFFSetDirectory.3t" > $@
 -lib/TIFFSetWarningHandler.3t:;	${ECHO} ".so ${MANDIR}TIFFWarning.3t" > $@
@@ -64,6 +67,8 @@
 -lib/TIFFDefaultTileSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
 -lib/TIFFTileRowSize.3t:;	${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@
 -lib/TIFFVGetField.3t:;		${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@
+-lib/TIFFGetFieldDefaulted.3t:;	${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@
+-lib/TIFFVGetFieldDefaulted.3t:;	${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@
 -lib/TIFFVSetField.3t:;		${ECHO} ".so ${MANDIR}TIFFSetField.3t" > $@
 -lib/TIFFFindCODEC.3t:;		${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
 -lib/TIFFRegisterCODEC.3t:;	${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@
@@ -98,10 +103,12 @@
 +lib/TIFFLastDirectory.3t:;	${LN} ${MANDIR}TIFFquery.3t $@
 +lib/TIFFReverseBits.3t:;	${LN} ${MANDIR}TIFFswab.3t $@
 +lib/TIFFRewriteDirectory.3t:;	${LN} ${MANDIR}TIFFWriteDirectory.3t $@
++lib/TIFFCheckpointDirectory.3t:; ${LN} ${MANDIR}TIFFWriteDirectory.3t $@
 +lib/TIFFRGBAImageOK.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
 +lib/TIFFRGBAImageBegin.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
 +lib/TIFFRGBAImageGet.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
 +lib/TIFFRGBAImageEnd.3t:;	${LN} ${MANDIR}TIFFRGBAImage.3t $@
++lib/TIFFReadRGBAImageOriented.3t:;	${LN} ${MANDIR}TIFFReadRGBAImage.3t $@
 +lib/TIFFSetErrorHandler.3t:;	${LN} ${MANDIR}TIFFError.3t $@
 +lib/TIFFSetSubDirectory.3t:;	${LN} ${MANDIR}TIFFSetDirectory.3t $@
 +lib/TIFFSetWarningHandler.3t:;	${LN} ${MANDIR}TIFFWarning.3t $@
@@ -119,6 +126,8 @@
 +lib/TIFFDefaultTileSize.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
 +lib/TIFFTileRowSize.3t:;	${LN} ${MANDIR}TIFFtile.3t $@
 +lib/TIFFVGetField.3t:;		${LN} ${MANDIR}TIFFGetField.3t $@
++lib/TIFFGetFieldDefaulted.3t:;	${LN} ${MANDIR}TIFFGetField.3t $@
++lib/TIFFVGetFieldDefaulted.3t:;	${LN} ${MANDIR}TIFFGetField.3t $@
 +lib/TIFFVSetField.3t:;		${LN} ${MANDIR}TIFFSetField.3t $@
 +lib/TIFFFindCODEC.3t:;		${LN} ${MANDIR}TIFFcodec.3t $@
 +lib/TIFFRegisterCODEC.3t:;	${LN} ${MANDIR}TIFFcodec.3t $@
@@ -134,21 +143,3 @@
  
  apps/Makefile:
  	test -d apps || mkdir apps
-@@ -344,7 +345,7 @@ apps/Makefile:
- 	 for i in *.1; do						\
- 	    f=${MANAPPNAME};						\
- 	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
--		-F ${DESTDIR}${MAN}/${MANAPPS}				\
-+		-F $${DESTDIR}${MAN}/${MANAPPS}				\
- 		-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f";	\
- 	 done								\
- 	)>apps/Makefile
-@@ -357,7 +358,7 @@ lib/Makefile:
- 	 for i in *.3t; do						\
- 	    f=${MANLIBNAME};						\
- 	    ${ECHO} '	cd ..; ${INSTALL} -m 444 			\
--		-F ${DESTDIR}${MAN}/${MANLIB}				\
-+		-F $${DESTDIR}${MAN}/${MANLIB}				\
- 		-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f";		\
- 	 done								\
- 	)>lib/Makefile
diff --git a/graphics/tiff/patches/patch-tools_Makefile_in b/graphics/tiff/patches/patch-tools_Makefile_in
deleted file mode 100644
index d4bf5c47dd1..00000000000
--- a/graphics/tiff/patches/patch-tools_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/Makefile.in.orig	Mon Dec  3 21:14:22 2001
-+++ tools/Makefile.in	Mon Dec  3 21:20:08 2001
-@@ -111,9 +111,9 @@ all:	${TARGETS}
- 	    true; \
- 	fi
- install: all
--	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
-+	${INSTALL} -idb tiff.sw.tools -m 755 				\
- 		-dir ${DESTDIR}@DIR_BIN@
--	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 		\
-+	${INSTALL} -idb tiff.sw.tools -m 755 				\
- 		-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
- 	@if [ "@LIBIMAGE@" = yes ]; then 				\
- 	    ${INSTALL} -idb tiff.sw.tools -m 755 			\
diff --git a/graphics/tiff/patches/patch-tools_fax2ps_c b/graphics/tiff/patches/patch-tools_fax2ps_c
index 50468d63ff5..c248fa847ea 100644
--- a/graphics/tiff/patches/patch-tools_fax2ps_c
+++ b/graphics/tiff/patches/patch-tools_fax2ps_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tools_fax2ps_c,v 1.2 2002/01/19 09:34:42 brad Exp $
---- tools/fax2ps.c.orig	Wed Mar 28 20:45:43 2001
-+++ tools/fax2ps.c	Fri Jan 18 23:48:37 2002
+$OpenBSD: patch-tools_fax2ps_c,v 1.3 2003/12/23 23:45:41 brad Exp $
+--- tools/fax2ps.c.orig	2003-10-04 07:43:17.000000000 -0400
++++ tools/fax2ps.c	2003-12-13 02:13:27.000000000 -0500
 @@ -23,6 +23,7 @@
   * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
   * OF THIS SOFTWARE.
@@ -9,7 +9,7 @@ $OpenBSD: patch-tools_fax2ps_c,v 1.2 2002/01/19 09:34:42 brad Exp $
  #include <math.h>
  #include <stdio.h>
  #include <string.h>
-@@ -370,15 +371,19 @@ main(int argc, char** argv)
+@@ -372,15 +373,19 @@ main(int argc, char** argv)
  	} while (++optind < argc);
      } else {
  	int n;
diff --git a/graphics/tiff/patches/patch-tools_tiffset_c b/graphics/tiff/patches/patch-tools_tiffset_c
deleted file mode 100644
index 65d890d38eb..00000000000
--- a/graphics/tiff/patches/patch-tools_tiffset_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tools_tiffset_c,v 1.1 2003/04/15 15:30:52 avsm Exp $
---- tools/tiffset.c.orig	Mon Apr 14 17:03:27 2003
-+++ tools/tiffset.c	Mon Apr 14 17:11:28 2003
-@@ -86,7 +86,7 @@ main(int argc, char* argv[])
- 
-             if( id < 1 )
-             {
--                fprintf( stderr, "Field name %s not recognised.\n" );
-+                fprintf( stderr, "Field name %s not recognised.\n", argv[arg_index+1] );
-                 exit( -3 );
-             }
- 
-@@ -112,7 +112,7 @@ main(int argc, char* argv[])
- 
-             if( id < 1 )
-             {
--                fprintf( stderr, "Field name %s not recognised.\n" );
-+                fprintf( stderr, "Field name %s not recognised.\n", argv[arg_index+1] );
-                 exit( -3 );
-             }
- 
diff --git a/graphics/tiff/patches/sup-sparc64 b/graphics/tiff/patches/sup-sparc64
index 14b74caf5ad..46335728792 100644
--- a/graphics/tiff/patches/sup-sparc64
+++ b/graphics/tiff/patches/sup-sparc64
@@ -1,6 +1,7 @@
---- libtiff/Makefile.in.orig	Wed Jan 23 20:32:58 2002
-+++ libtiff/Makefile.in	Wed Jan 23 20:39:54 2002
-@@ -278,7 +278,7 @@ tif_dir.o: ${SRCDIR}/tif_dir.c
+$OpenBSD: sup-sparc64,v 1.2 2003/12/23 23:45:41 brad Exp $
+--- libtiff/Makefile.in.orig	2003-08-20 06:42:17.000000000 -0400
++++ libtiff/Makefile.in	2003-12-13 02:36:14.000000000 -0500
+@@ -290,7 +290,7 @@ tif_dir.o: ${SRCDIR}/tif_dir.c
  tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c
  tif_dirread.o: ${SRCDIR}/tif_dirread.c
diff --git a/graphics/tiff/pkg/PFRAG.shared b/graphics/tiff/pkg/PFRAG.shared
index 92b9db0a18a..3b3463daa1c 100644
--- a/graphics/tiff/pkg/PFRAG.shared
+++ b/graphics/tiff/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2002/01/19 09:34:42 brad Exp $
-lib/libtiff.so.35.7
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2003/12/23 23:45:41 brad Exp $
+lib/libtiff.so.36.0
+DYNLIBDIR(%D/lib)
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 03253292d67..331ffff82f6 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.8 2002/01/19 09:34:42 brad Exp $
+@comment $OpenBSD: PLIST,v 1.9 2003/12/23 23:45:41 brad Exp $
 bin/fax2ps
 bin/fax2tiff
 bin/gif2tiff
 bin/pal2rgb
 bin/ppm2tiff
 bin/ras2tiff
+bin/raw2tiff
 bin/rgb2ycbcr
 bin/thumbnail
 bin/tiff2bw
@@ -30,6 +31,7 @@ man/man1/gif2tiff.1
 man/man1/pal2rgb.1
 man/man1/ppm2tiff.1
 man/man1/ras2tiff.1
+man/man1/raw2tiff.1
 man/man1/rgb2ycbcr.1
 man/man1/sgi2tiff.1
 man/man1/thumbnail.1
@@ -54,6 +56,7 @@ man/man3/TIFFCurrentDirectory.3t
 man/man3/TIFFCurrentRow.3t
 man/man3/TIFFCurrentStrip.3t
 man/man3/TIFFCurrentTile.3t
+man/man3/TIFFDataWidth.3t
 man/man3/TIFFDefaultStripSize.3t
 man/man3/TIFFDefaultTileSize.3t
 man/man3/TIFFError.3t
@@ -64,6 +67,7 @@ man/man3/TIFFFindCODEC.3t
 man/man3/TIFFFlush.3t
 man/man3/TIFFFlushData.3t
 man/man3/TIFFGetField.3t
+man/man3/TIFFGetFieldDefaulted.3t
 man/man3/TIFFGetMode.3t
 man/man3/TIFFIsByteSwapped.3t
 man/man3/TIFFIsMSB2LSB.3t
@@ -84,6 +88,7 @@ man/man3/TIFFReadDirectory.3t
 man/man3/TIFFReadEncodedStrip.3t
 man/man3/TIFFReadEncodedTile.3t
 man/man3/TIFFReadRGBAImage.3t
+man/man3/TIFFReadRGBAImageOriented.3t
 man/man3/TIFFReadRGBAStrip.3t
 man/man3/TIFFReadRGBATile.3t
 man/man3/TIFFReadRawStrip.3t
@@ -108,6 +113,7 @@ man/man3/TIFFTileRowSize.3t
 man/man3/TIFFTileSize.3t
 man/man3/TIFFUnRegisterCODEC.3t
 man/man3/TIFFVGetField.3t
+man/man3/TIFFVGetFieldDefaulted.3t
 man/man3/TIFFVSetField.3t
 man/man3/TIFFVStripSize.3t
 man/man3/TIFFVTileSize.3t
@@ -178,6 +184,10 @@ share/doc/tiff/v3.4beta036.html
 share/doc/tiff/v3.5.1.html
 share/doc/tiff/v3.5.2.html
 share/doc/tiff/v3.5.3.html
+share/doc/tiff/v3.5.4.html
+share/doc/tiff/v3.5.5.html
+share/doc/tiff/v3.5.6-beta.html
 share/doc/tiff/v3.5.7.html
+share/doc/tiff/v3.6.0.html
 @dirrm share/doc/tiff/images
 @dirrm share/doc/tiff