diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 46cdf2d248f..ad263877dd6 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2010/07/11 15:57:46 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/31 00:30:27 kevlo Exp $
 
 COMMENT=		extracts files from Microsoft CAB archives
 
-DISTNAME=		cabextract-1.2
+DISTNAME=		cabextract-1.3
 CATEGORIES=		archivers
 
 HOMEPAGE=		http://www.cabextract.org.uk/
@@ -15,7 +15,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-REVISION =	0
 WANTLIB=		c
 
 MASTER_SITES=		${HOMEPAGE}
diff --git a/archivers/cabextract/distinfo b/archivers/cabextract/distinfo
index a8a6d649c95..f54222c61e0 100644
--- a/archivers/cabextract/distinfo
+++ b/archivers/cabextract/distinfo
@@ -1,5 +1,5 @@
-MD5 (cabextract-1.2.tar.gz) = 3EIaaQZItQMmXIKt6E4UPg==
-RMD160 (cabextract-1.2.tar.gz) = VSkuKHBHsUlF5psL6Kuf8dSQL3E=
-SHA1 (cabextract-1.2.tar.gz) = hxs9tLwmKetXJmWcFHrs6hr2ptA=
-SHA256 (cabextract-1.2.tar.gz) = rpyGCnT86hCYh7TPXej85XWsFHN1cVILFLhIFvFxJes=
-SIZE (cabextract-1.2.tar.gz) = 194006
+MD5 (cabextract-1.3.tar.gz) = y5pKOEcNKnGgJ1lo5+tk0w==
+RMD160 (cabextract-1.3.tar.gz) = oC/BYXGdV8vuk08KEu1UQex93Cc=
+SHA1 (cabextract-1.3.tar.gz) = ESRpueWEl6XPouyz2e6506QVHJ8=
+SHA256 (cabextract-1.3.tar.gz) = 1GQ4OjW0jVSjmQwC+JrL/Gd+ZV70YZTq5k+49DPDwAE=
+SIZE (cabextract-1.3.tar.gz) = 217633
diff --git a/archivers/cabextract/patches/patch-mspack_cabd_c b/archivers/cabextract/patches/patch-mspack_cabd_c
index 4723b3dbafb..885c144a9fd 100644
--- a/archivers/cabextract/patches/patch-mspack_cabd_c
+++ b/archivers/cabextract/patches/patch-mspack_cabd_c
@@ -1,21 +1,21 @@
-$OpenBSD: patch-mspack_cabd_c,v 1.1 2007/07/19 09:49:59 jasper Exp $
---- mspack/cabd.c.orig	Thu Sep 21 01:13:14 2006
-+++ mspack/cabd.c	Thu Jul 19 11:37:31 2007
-@@ -703,7 +703,7 @@ static int cabd_find(struct mscab_decompressor_p *this
+$OpenBSD: patch-mspack_cabd_c,v 1.2 2010/07/31 00:30:27 kevlo Exp $
+--- mspack/cabd.c.orig	Tue Jul 20 00:39:26 2010
++++ mspack/cabd.c	Fri Jul 30 16:20:40 2010
+@@ -688,7 +688,7 @@ static int cabd_find(struct mscab_decompressor_p *this
  	/* if off_t is only 32-bits signed, there will be overflow problems
  	 * with cabinets reaching past the 2GB barrier (or just claiming to)
  	 */
--#if _FILE_OFFSET_BITS < 64
+-#ifndef LARGEFILE_SUPPORT
 +	if (sizeof(off_t) <= sizeof(uint32_t)) {
  	if (cablen_u32 & ~0x7FFFFFFF) {
  	  sys->message(fh, largefile_msg);
  	  cablen_u32 = 0x7FFFFFFF;
-@@ -712,7 +712,7 @@ static int cabd_find(struct mscab_decompressor_p *this
+@@ -697,7 +697,7 @@ static int cabd_find(struct mscab_decompressor_p *this
  	  sys->message(fh, largefile_msg);
  	  foffset_u32 = 0x7FFFFFFF;
  	}
 -#endif
-+        }
++	}
  	/* copy the unsigned 32-bit offsets to signed off_t variables */
  	foffset = (off_t) foffset_u32;
  	cablen  = (off_t) cablen_u32;
diff --git a/archivers/cabextract/patches/patch-mspack_mspack_h b/archivers/cabextract/patches/patch-mspack_mspack_h
new file mode 100644
index 00000000000..219a152fdd4
--- /dev/null
+++ b/archivers/cabextract/patches/patch-mspack_mspack_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mspack_mspack_h,v 1.1 2010/07/31 00:30:27 kevlo Exp $
+--- mspack/mspack.h.orig	Fri Jul 30 16:35:48 2010
++++ mspack/mspack.h	Fri Jul 30 16:36:00 2010
+@@ -360,7 +360,7 @@ struct mspack_system {
+    * @see open()
+    */
+   void (*message)(struct mspack_file *file,
+-		  char *format,
++		  const char *format,
+ 		  ...);
+ 
+   /**
diff --git a/archivers/cabextract/patches/patch-src_cabextract_c b/archivers/cabextract/patches/patch-src_cabextract_c
new file mode 100644
index 00000000000..257e175092b
--- /dev/null
+++ b/archivers/cabextract/patches/patch-src_cabextract_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_cabextract_c,v 1.1 2010/07/31 00:30:27 kevlo Exp $
+--- src/cabextract.c.orig	Mon Jul 12 22:53:12 2010
++++ src/cabextract.c	Fri Jul 30 16:48:06 2010
+@@ -229,7 +229,7 @@ static int cabx_read(struct mspack_file *file, void *b
+ static int cabx_write(struct mspack_file *file, void *buffer, int bytes);
+ static int cabx_seek(struct mspack_file *file, off_t offset, int mode);
+ static off_t cabx_tell(struct mspack_file *file);
+-static void cabx_msg(struct mspack_file *file, char *format, ...);
++static void cabx_msg(struct mspack_file *file, const char *format, ...);
+ static void *cabx_alloc(struct mspack_system *this, size_t bytes);
+ static void cabx_free(void *buffer);
+ static void cabx_copy(void *src, void *dest, size_t bytes);
+@@ -1191,7 +1191,7 @@ static off_t cabx_tell(struct mspack_file *file) {
+ #endif
+ }
+ 
+-static void cabx_msg(struct mspack_file *file, char *format, ...) {
++static void cabx_msg(struct mspack_file *file, const char *format, ...) {
+   va_list ap;
+   if (file) {
+     fprintf(stderr, "%s: ", ((struct mspack_file_p *) file)->name);
diff --git a/archivers/cabextract/pkg/PLIST b/archivers/cabextract/pkg/PLIST
index 74a5628b303..dc552b259d0 100644
--- a/archivers/cabextract/pkg/PLIST
+++ b/archivers/cabextract/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/08/03 11:30:01 espie Exp $
-bin/cabextract
+@comment $OpenBSD: PLIST,v 1.3 2010/07/31 00:30:27 kevlo Exp $
+@bin bin/cabextract
 @man man/man1/cabextract.1