diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile
index 518d567f29e..d93d98a4013 100644
--- a/databases/p5-sybperl/Makefile
+++ b/databases/p5-sybperl/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2004/08/10 10:26:50 xsa Exp $
+# $OpenBSD: Makefile,v 1.14 2004/09/28 01:10:35 jcs Exp $
 
-DISTNAME=	sybperl-2.16
-PKGNAME=	p5-${DISTNAME}p0
+DISTNAME=	sybperl-2.17
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	databases perl5
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,7 +13,7 @@ NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"Sybase database access in Perl"
 HOMEPAGE=	http://www.mbay.net/~mpeppler/
-MASTER_SITES=	http://www.peppler.org/downloads/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Sybase/}
 
 MAINTAINER=	Joshua Stein <jcs@rt.fm>
 
diff --git a/databases/p5-sybperl/distinfo b/databases/p5-sybperl/distinfo
index 33893e761f8..0ee52c0dc89 100644
--- a/databases/p5-sybperl/distinfo
+++ b/databases/p5-sybperl/distinfo
@@ -1,3 +1,3 @@
-MD5 (sybperl-2.16.tar.gz) = f623866f0127f6da16427d6ecf19c3b3
-RMD160 (sybperl-2.16.tar.gz) = d26ca6dc0114f6683bf88c5dfb8703fb2415e8fa
-SHA1 (sybperl-2.16.tar.gz) = 1908abd8101e6ecd27bcda0873128fb36f37c81a
+MD5 (sybperl-2.17.tar.gz) = 095bff1455b033cf2b7740e78857ea46
+RMD160 (sybperl-2.17.tar.gz) = 861724b2141434cdc8b6f715374c55d70bfecddb
+SHA1 (sybperl-2.17.tar.gz) = 1c2c89aee124de1a1d5d8b25efd84d6970f57c08
diff --git a/databases/p5-sybperl/patches/patch-CTlib_CTlib_xs b/databases/p5-sybperl/patches/patch-CTlib_CTlib_xs
deleted file mode 100644
index 711c965f13b..00000000000
--- a/databases/p5-sybperl/patches/patch-CTlib_CTlib_xs
+++ /dev/null
@@ -1,37 +0,0 @@
-$OpenBSD: patch-CTlib_CTlib_xs,v 1.1 2002/10/31 01:32:08 jcs Exp $
---- CTlib/CTlib.xs.orig	Tue Oct 22 13:10:54 2002
-+++ CTlib/CTlib.xs	Wed Oct 30 19:22:52 2002
-@@ -92,6 +92,7 @@
- */
- #define MAX_CHAR_BUF	1024
- 
-+#define CS_COMPLETION_CB 1
- 
- typedef struct _col_data
- {
-@@ -1952,7 +1953,6 @@
-     CS_INT      cs_ver;
-     dTHR;
- 
--#if 0
-     if((retcode = cs_ctx_alloc(CTLIB_VERSION, &context)) != CS_SUCCEED)
- 	croak("Sybase::CTlib initialize: cs_ctx_alloc() failed");
- 
-@@ -1962,8 +1962,8 @@
- 	context = NULL;
- 	croak("Sybase::CTlib initialize: ct_init() failed");
-     }
--#endif
- 
-+#if 0
- #if defined(CS_VERSION_125)
-     cs_ver = CS_VERSION_125;
-     retcode = cs_ctx_global(cs_ver, &context);
-@@ -1984,6 +1984,7 @@
- 	cs_ver = CS_VERSION_100;
- 	retcode = cs_ctx_global(cs_ver, &context);
-     }
-+#endif
- 
-     if(retcode != CS_SUCCEED)
- 	croak("Sybase::CTlib initialize: cs_ctx_alloc(%d) failed", cs_ver);