diff --git a/misc/bsdiff/Makefile b/misc/bsdiff/Makefile
new file mode 100644
index 00000000000..c864dc756dd
--- /dev/null
+++ b/misc/bsdiff/Makefile
@@ -0,0 +1,28 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+
+COMMENT=	"binary patch tools"
+DISTNAME=	bsdiff-4.1
+CATEGORIES=	misc devel
+MASTER_SITES=	${HOMEPAGE}
+
+HOMEPAGE=	http://www.daemonology.net/bsdiff/
+
+MAINTAINER=	Michael van der Westhuizen <michael@skanky.homeunix.net>
+
+# Conditional BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MAKE_FLAGS=	BZIP2=${LOCALBASE}/bin/bzip2
+FAKE_FLAGS=	PREFIX=${WRKINST}${PREFIX}
+NO_REGRESS=	Yes
+
+RUN_DEPENDS=	:bzip2-*:archivers/bzip2
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bsdiff
+	${INSTALL_DATA} ${WRKBUILD}/LICENSE ${PREFIX}/share/doc/bsdiff
+
+.include <bsd.port.mk>
diff --git a/misc/bsdiff/distinfo b/misc/bsdiff/distinfo
new file mode 100644
index 00000000000..99b0ffd5b7b
--- /dev/null
+++ b/misc/bsdiff/distinfo
@@ -0,0 +1,3 @@
+MD5 (bsdiff-4.1.tar.gz) = bf69ae7c185ea1a9863c8b40251fbc3a
+RMD160 (bsdiff-4.1.tar.gz) = 0f2076db87b8bfd1b685c81a6f0e823cb3de7aa8
+SHA1 (bsdiff-4.1.tar.gz) = 0c24b121916704069f23199da0689b3e49b77796
diff --git a/misc/bsdiff/patches/patch-Makefile b/misc/bsdiff/patches/patch-Makefile
new file mode 100644
index 00000000000..7e77aec4e64
--- /dev/null
+++ b/misc/bsdiff/patches/patch-Makefile
@@ -0,0 +1,9 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+--- Makefile.orig	2004-01-25 14:02:26.000000000 +0200
++++ Makefile	2004-01-25 14:02:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-CFLAGS		+=	-O3
++CFLAGS		?=	-O3
+ .ifdef BZIP2
+ CFLAGS		+=	-DBZIP2=\"${BZIP2}\"
+ .endif
diff --git a/misc/bsdiff/patches/patch-bsdiff_1 b/misc/bsdiff/patches/patch-bsdiff_1
new file mode 100644
index 00000000000..ecef92563fc
--- /dev/null
+++ b/misc/bsdiff/patches/patch-bsdiff_1
@@ -0,0 +1,20 @@
+$OpenBSD: patch-bsdiff_1,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+--- bsdiff.1.orig	2003-06-07 10:25:05.000000000 +0200
++++ bsdiff.1	2004-01-02 15:22:15.000000000 +0200
+@@ -1,12 +1,14 @@
+ .Dd May 18, 2003
+ .Dt BSDIFF 1
+-.Os FreeBSD
++.Os
+ .Sh NAME
+ .Nm bsdiff
+ .Nd generate a patch between two binary files
+ .Sh SYNOPSIS
+ .Nm
+-.Ao Ar oldfile Ac Ao Ar newfile Ac Ao Ar patchfile Ac
++.Ao Ar oldfile Ac
++.Ao Ar newfile Ac
++.Ao Ar patchfile Ac
+ .Sh DESCRIPTION
+ .Nm
+ compares
diff --git a/misc/bsdiff/patches/patch-bsdiff_c b/misc/bsdiff/patches/patch-bsdiff_c
new file mode 100644
index 00000000000..31cf8e555ef
--- /dev/null
+++ b/misc/bsdiff/patches/patch-bsdiff_c
@@ -0,0 +1,30 @@
+$OpenBSD: patch-bsdiff_c,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+--- bsdiff.c.orig	2003-07-07 18:19:26.000000000 -0500
++++ bsdiff.c	2004-04-10 16:03:49.000000000 -0500
+@@ -251,7 +251,7 @@ int main(int argc,char *argv[])
+ 			(dup2(p[0],0)==-1) || (close(fd)==-1) ||
+ 			(close(p[0])==-1) || (close(p[1])==-1))
+ 			err(1,NULL);
+-		execl(BZIP2,BZIP2,"-zc",NULL);
++		execl(BZIP2,BZIP2,"-zc",(void *)NULL);
+ 		err(1,"%s",BZIP2);
+ 	};
+ 	if(close(p[0])==-1) err(1,NULL);
+@@ -348,7 +348,7 @@ int main(int argc,char *argv[])
+ 			(dup2(p[0],0)==-1) || (close(fd)==-1) ||
+ 			(close(p[0])==-1) || (close(p[1])==-1))
+ 			err(1,NULL);
+-		execl(BZIP2,BZIP2,"-zc",NULL);
++		execl(BZIP2,BZIP2,"-zc",(void *)NULL);
+ 		err(1,"%s",BZIP2);
+ 	};
+ 	if(close(p[0])==-1) err(1,NULL);
+@@ -367,7 +367,7 @@ int main(int argc,char *argv[])
+ 			(dup2(p[0],0)==-1) || (close(fd)==-1) ||
+ 			(close(p[0])==-1) || (close(p[1])==-1))
+ 			err(1,NULL);
+-		execl(BZIP2,BZIP2,"-zc",NULL);
++		execl(BZIP2,BZIP2,"-zc",(void *)NULL);
+ 		err(1,"%s",BZIP2);
+ 	};
+ 	if(close(p[0])==-1) err(1,NULL);
diff --git a/misc/bsdiff/patches/patch-bspatch_1 b/misc/bsdiff/patches/patch-bspatch_1
new file mode 100644
index 00000000000..cd49b63727b
--- /dev/null
+++ b/misc/bsdiff/patches/patch-bspatch_1
@@ -0,0 +1,20 @@
+$OpenBSD: patch-bspatch_1,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+--- bspatch.1.orig	2003-06-07 10:27:01.000000000 +0200
++++ bspatch.1	2004-01-02 15:22:15.000000000 +0200
+@@ -1,12 +1,14 @@
+ .Dd May 18, 2003
+ .Dt BSPATCH 1
+-.Os FreeBSD
++.Os
+ .Sh NAME
+ .Nm bspatch
+ .Nd apply a patch built with bsdiff(1)
+ .Sh SYNOPSIS
+ .Nm
+-.Ao Ar oldfile Ac Ao Ar newfile Ac Ao Ar patchfile Ac
++.Ao Ar oldfile Ac
++.Ao Ar newfile Ac
++.Ao Ar patchfile Ac
+ .Sh DESCRIPTION
+ .Nm
+ generates
diff --git a/misc/bsdiff/patches/patch-bspatch_c b/misc/bsdiff/patches/patch-bspatch_c
new file mode 100644
index 00000000000..41c6c83f78c
--- /dev/null
+++ b/misc/bsdiff/patches/patch-bspatch_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-bspatch_c,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+--- bspatch.c.orig	2003-06-18 17:51:13.000000000 -0500
++++ bspatch.c	2004-04-10 16:04:21.000000000 -0500
+@@ -59,7 +59,7 @@ int bz2read(int fd,off_t offset,off_t le
+ 		if((dup2(p1[1],1)==-1) || close(p1[1])) err(1,NULL);
+ 		if(close(fd)==-1) err(1,"%s",fname);
+ 
+-		execl(BZIP2,BZIP2,"-dc",NULL);
++		execl(BZIP2,BZIP2,"-dc",(void *)NULL);
+ 		err(1,"%s",BZIP2);
+ 	};
+ 
diff --git a/misc/bsdiff/pkg/DESCR b/misc/bsdiff/pkg/DESCR
new file mode 100644
index 00000000000..ccdcb4641d7
--- /dev/null
+++ b/misc/bsdiff/pkg/DESCR
@@ -0,0 +1,10 @@
+Tools for building and applying patches to binary files.
+
+The tools included are:
+
+ o bsdiff - Binary patch generation
+ o bspatch - Binary patch application
+
+These tools are analogous to diff(1) and patch(1) but deal specifically
+with binary files.  The binary diffs produced are significantly smaller
+than those produced by similar tools (free and commercial).
diff --git a/misc/bsdiff/pkg/PLIST b/misc/bsdiff/pkg/PLIST
new file mode 100644
index 00000000000..7b01c9e7664
--- /dev/null
+++ b/misc/bsdiff/pkg/PLIST
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2004/04/10 21:21:27 jolan Exp $
+bin/bsdiff
+bin/bspatch
+man/man1/bsdiff.1
+man/man1/bspatch.1
+share/doc/bsdiff/LICENSE
+@dirrm share/doc/bsdiff