diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile
index 4d568a15ba4..7687d501163 100644
--- a/net/cvsync/Makefile
+++ b/net/cvsync/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2007/09/15 22:36:52 merdely Exp $
+# $OpenBSD: Makefile,v 1.40 2008/08/25 17:13:22 naddy Exp $
 
 COMMENT=	portable CVS repository synchronization utility
 
 DISTNAME=	cvsync-0.24.19
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 HOMEPAGE=	http://www.cvsync.org/
 
diff --git a/net/cvsync/patches/patch-common_refuse_c b/net/cvsync/patches/patch-common_refuse_c
new file mode 100644
index 00000000000..85b9f35165e
--- /dev/null
+++ b/net/cvsync/patches/patch-common_refuse_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-common_refuse_c,v 1.1 2008/08/25 17:13:22 naddy Exp $
+--- common/refuse.c.orig	Mon Aug 25 19:07:21 2008
++++ common/refuse.c	Mon Aug 25 19:07:36 2008
+@@ -246,7 +246,7 @@ refuse_access(struct refuse_args *ra, struct cvsync_at
+ 			continue;
+ 		namelen = strlen(pat);
+ 		ep = pat + namelen;
+-		while (ep >= pat) {
++		while (ep > pat) {
+ 			if (*--ep != '/')
+ 				continue;
+ 
diff --git a/net/cvsync/patches/patch-samples_cvsyncd-OpenBSD_conf b/net/cvsync/patches/patch-samples_cvsyncd-OpenBSD_conf
new file mode 100644
index 00000000000..fbcfbf24b1f
--- /dev/null
+++ b/net/cvsync/patches/patch-samples_cvsyncd-OpenBSD_conf
@@ -0,0 +1,12 @@
+$OpenBSD: patch-samples_cvsyncd-OpenBSD_conf,v 1.1 2008/08/25 17:13:22 naddy Exp $
+--- samples/cvsyncd-OpenBSD.conf.orig	Mon Aug 25 19:07:48 2008
++++ samples/cvsyncd-OpenBSD.conf	Mon Aug 25 19:08:22 2008
+@@ -32,4 +32,8 @@ config {
+ 		super openbsd release rcs
+ 		name openbsd-xf4 prefix XF4
+ 	}
++	collection {
++		super openbsd release rcs
++		name openbsd-xenocara prefix xenocara
++	}
+ }