diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index 2dc78e60aff..f8180fc11ab 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2007/09/15 20:09:41 simon Exp $
+# $OpenBSD: Makefile,v 1.33 2010/06/29 22:40:45 naddy Exp $
 
 COMMENT=	lossless image compression library
 
 DISTNAME=	jbigkit-1.6
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS=	jbig	2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
diff --git a/graphics/jbigkit/patches/patch-pbmtools_Makefile b/graphics/jbigkit/patches/patch-pbmtools_Makefile
index 1432e5a82ae..5cf96b0f7e0 100644
--- a/graphics/jbigkit/patches/patch-pbmtools_Makefile
+++ b/graphics/jbigkit/patches/patch-pbmtools_Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-pbmtools_Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $
---- pbmtools/Makefile.orig	2000-04-08 07:15:52.000000000 -0400
-+++ pbmtools/Makefile	2004-01-11 03:03:23.000000000 -0500
-@@ -9,7 +9,7 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l
+$OpenBSD: patch-pbmtools_Makefile,v 1.2 2010/06/29 22:40:45 naddy Exp $
+--- pbmtools/Makefile.orig	Wed Jun 11 11:27:22 2003
++++ pbmtools/Makefile	Tue Jun 29 16:19:46 2010
+@@ -9,7 +9,7 @@ CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
  
  .SUFFIXES: .1 .5 .txt $(SUFFIXES)
  
diff --git a/graphics/jbigkit/patches/patch-pbmtools_jbgtopbm_c b/graphics/jbigkit/patches/patch-pbmtools_jbgtopbm_c
new file mode 100644
index 00000000000..31a35bfe1c8
--- /dev/null
+++ b/graphics/jbigkit/patches/patch-pbmtools_jbgtopbm_c
@@ -0,0 +1,86 @@
+$OpenBSD: patch-pbmtools_jbgtopbm_c,v 1.1 2010/06/29 22:40:45 naddy Exp $
+--- pbmtools/jbgtopbm.c.orig	Fri Jun 11 08:17:57 2004
++++ pbmtools/jbgtopbm.c	Tue Jun 29 16:28:35 2010
+@@ -112,7 +112,7 @@ void diagnose_bie(FILE *f)
+   /* read BIH */
+   read_file(&bie, &buflen, &len, f);
+   if (len < 20) {
+-    fprintf(d, "Error: Input file is %d < 20 bytes long and therefore "
++    fprintf(d, "Error: Input file is %zd < 20 bytes long and therefore "
+ 	    "does not contain an intact BIE header!\n", len);
+     return;
+   }
+@@ -158,30 +158,30 @@ void diagnose_bie(FILE *f)
+       == (JBG_DPON | JBG_DPPRIV))
+     p += 1728;  /* skip DPTABLE */
+   if (p > bie + len) {
+-    fprintf(d, "Error: Input file is %d < 20+1728 bytes long and therefore "
++    fprintf(d, "Error: Input file is %zd < 20+1728 bytes long and therefore "
+ 	    "does not contain an intact BIE header with DPTABLE!\n", len);
+     return;
+   }
+   while (p != bie + len) {
+     if (p > bie + len - 2) {
+-      fprintf(d, "%06x: Error: single byte 0x%02x left\n", p - bie, *p);
++      fprintf(d, "%06tx: Error: single byte 0x%02x left\n", p - bie, *p);
+       return;
+     }
+     if (p[0] != MARKER_ESC || p[1] == MARKER_STUFF) {
+-      fprintf(d, "%06x: PSCD\n", p - bie);
++      fprintf(d, "%06tx: PSCD\n", p - bie);
+     } else
+       switch (p[1]) {
+       case MARKER_SDNORM:
+-	fprintf(d, "%06x: ESC SDNORM #%d\n", p - bie, sde++);
++	fprintf(d, "%06tx: ESC SDNORM #%d\n", p - bie, sde++);
+ 	break;
+       case MARKER_SDRST:
+-	fprintf(d, "%06x: ESC SDRST #%d\n", p - bie, sde++);
++	fprintf(d, "%06tx: ESC SDRST #%d\n", p - bie, sde++);
+ 	break;
+       case MARKER_ABORT:
+-	fprintf(d, "%06x: ESC ABORT\n", p - bie);
++	fprintf(d, "%06tx: ESC ABORT\n", p - bie);
+ 	break;
+       case MARKER_NEWLEN:
+-	fprintf(d, "%06x: ESC NEWLEN ", p - bie);
++	fprintf(d, "%06tx: ESC NEWLEN ", p - bie);
+ 	if (p + 5 < bie + len)
+ 	  fprintf(d, "YD = %lu\n",
+ 		  (((long) p[2] << 24) | ((long) p[3] << 16) |
+@@ -190,7 +190,7 @@ void diagnose_bie(FILE *f)
+ 	  fprintf(d, "unexpected EOF\n");
+ 	break;
+       case MARKER_ATMOVE:
+-	fprintf(d, "%06x: ESC ATMOVE ", p - bie);
++	fprintf(d, "%06tx: ESC ATMOVE ", p - bie);
+ 	if (p + 7 < bie + len)
+ 	  fprintf(d, "YAT = %lu, tX = %d, tY = %d\n",
+ 		  (((long) p[2] << 24) | ((long) p[3] << 16) |
+@@ -199,7 +199,7 @@ void diagnose_bie(FILE *f)
+ 	  fprintf(d, "unexpected EOF\n");
+ 	break;
+       case MARKER_COMMENT:
+-	fprintf(d, "%06x: ESC COMMENT ", p - bie);
++	fprintf(d, "%06tx: ESC COMMENT ", p - bie);
+ 	if (p + 5 < bie + len)
+ 	  fprintf(d, "LC = %lu\n",
+ 		  (((long) p[2] << 24) | ((long) p[3] << 16) |
+@@ -208,7 +208,7 @@ void diagnose_bie(FILE *f)
+ 	  fprintf(d, "unexpected EOF\n");
+ 	break;
+       default:
+-	fprintf(d, "%06x: ESC 0x%02x\n", p - bie, p[1]);
++	fprintf(d, "%06tx: ESC 0x%02x\n", p - bie, p[1]);
+       }
+     p = jbg_next_pscdms(p, len - (p - bie));
+     if (!p) {
+@@ -319,7 +319,7 @@ int main (int argc, char **argv)
+   /* read BIH first to check VLENGTH */
+   len = fread(buffer, 1, 20, fin);
+   if (len < 20) {
+-    fprintf(stderr, "Input file '%s' (%d bytes) must be at least "
++    fprintf(stderr, "Input file '%s' (%zd bytes) must be at least "
+ 	    "20 bytes long\n", fnin, len);
+     if (fout != stdout) {
+       fclose(fout);