diff --git a/misc/bsdiff/Makefile b/misc/bsdiff/Makefile
index 34ff7af1d9d..46253ae42f4 100644
--- a/misc/bsdiff/Makefile
+++ b/misc/bsdiff/Makefile
@@ -1,31 +1,30 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 23:54:16 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2009/05/20 13:22:47 benoit Exp $
 
 COMMENT=	binary patch tools
-DISTNAME=	bsdiff-4.2
+DISTNAME=	bsdiff-4.3
 CATEGORIES=	misc devel
-MASTER_SITES=	${HOMEPAGE}
 
 HOMEPAGE=	http://www.daemonology.net/bsdiff/
 
-MAINTAINER=	Michael van der Westhuizen <michael@skanky.homeunix.net>
+MAINTAINER=	Benoit Lecocq <benoit@openbsd.org>
 
-# Conditional BSD
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
 
-MAKE_FLAGS=	BZIP2=${LOCALBASE}/bin/bzip2 \
-		CC='${CC}'
+WANTLIB=	c
 
+MASTER_SITES=	${HOMEPAGE}
+
+MAKE_FLAGS=	CC='${CC}' \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -lbz2"
+
+LIB_DEPENDS=	bz2::archivers/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
index d6d6426818e..da208cc2095 100644
--- a/misc/bsdiff/distinfo
+++ b/misc/bsdiff/distinfo
@@ -1,5 +1,5 @@
-MD5 (bsdiff-4.2.tar.gz) = n1gqd+t20RbYLRrSaO9I+g==
-RMD160 (bsdiff-4.2.tar.gz) = GiibIInpw2f7HtDd/gwxG9foU88=
-SHA1 (bsdiff-4.2.tar.gz) = MXCOZPCTQzJ9Yy7+AyuIgb/HHk8=
-SHA256 (bsdiff-4.2.tar.gz) = QwyKkCy2D6fiybI5td541HCRHnAYd0qYwatbJ4FeeTs=
-SIZE (bsdiff-4.2.tar.gz) = 7686
+MD5 (bsdiff-4.3.tar.gz) = 5tgSOU8ODsyNXfJVqh2yKg==
+RMD160 (bsdiff-4.3.tar.gz) = J7slW13VqlbToHbaycp20jinmgQ=
+SHA1 (bsdiff-4.3.tar.gz) = DAqJ1gT8Ve8rXmnNGDcrKXLt2Lg=
+SHA256 (bsdiff-4.3.tar.gz) = GIIViLLcW/FZqjfTvLe4hdhf/R4Z8joMV6WHI/6oX0g=
+SIZE (bsdiff-4.3.tar.gz) = 5740
diff --git a/misc/bsdiff/patches/patch-bsdiff_c b/misc/bsdiff/patches/patch-bsdiff_c
deleted file mode 100644
index 31cf8e555ef..00000000000
--- a/misc/bsdiff/patches/patch-bsdiff_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$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_c b/misc/bsdiff/patches/patch-bspatch_c
deleted file mode 100644
index 41c6c83f78c..00000000000
--- a/misc/bsdiff/patches/patch-bspatch_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$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/PLIST b/misc/bsdiff/pkg/PLIST
index f63ca4343d6..c30ea949af4 100644
--- a/misc/bsdiff/pkg/PLIST
+++ b/misc/bsdiff/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:15 espie Exp $
-bin/bsdiff
-bin/bspatch
+@comment $OpenBSD: PLIST,v 1.4 2009/05/20 13:22:52 benoit Exp $
+@bin bin/bsdiff
+@bin bin/bspatch
 @man man/man1/bsdiff.1
 @man man/man1/bspatch.1
-share/doc/bsdiff/
-share/doc/bsdiff/LICENSE