diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index 928f2b59d82b..9d01bd20caf4 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -7,19 +7,35 @@
 #
 
 PORTNAME=	Class-AutoClass
-PORTVERSION=	0.09
+PORTVERSION=	1.01
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITE_SUBDIR=	Class/CCAVNOR
 PKGNAMEPREFIX=	p5-
+DISTNAME=	autoclass_v${PORTVERSION:S/./_/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	Automatically define simple get and set methods in an inheritance structure
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper
+RUN_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		${SITE_PERL}/Test/Deep.pm:${PORTSDIR}/devel/p5-Test-Deep
 
 PERL_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/AutoClass
 
 MAN3=		Class::AutoClass::Root.3 Class::AutoClass.3 Class::AutoClass::Args.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+.endif
+
+.if ${PERL_LEVEL} < 500800
+IGNORE=	currently only supports Perl 5.8+.  This will hopefully change.  For now, please install lang/perl5.8 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Class-AutoClass/distinfo b/devel/p5-Class-AutoClass/distinfo
index fc47e1108e2e..bfd1ab227979 100644
--- a/devel/p5-Class-AutoClass/distinfo
+++ b/devel/p5-Class-AutoClass/distinfo
@@ -1,3 +1,3 @@
-MD5 (Class-AutoClass-0.09.tar.gz) = cf18b2614abb488c709ae62ea3796ff6
-SHA256 (Class-AutoClass-0.09.tar.gz) = 5b234e6656c599d749bb20154bb7c974fb0a9fa4cfe3b6e39ded38528f504dc5
-SIZE (Class-AutoClass-0.09.tar.gz) = 16738
+MD5 (autoclass_v1_01.tgz) = 5f04fa29d6cd01b4d1b707ed79edb8e6
+SHA256 (autoclass_v1_01.tgz) = a1b89d90e468fdd70ccba928b8aac68430aeaee890915da5e09ef091d2ebcf36
+SIZE (autoclass_v1_01.tgz) = 32115
diff --git a/devel/p5-Class-AutoClass/pkg-descr b/devel/p5-Class-AutoClass/pkg-descr
index 3993144afe1e..7ba417523c08 100644
--- a/devel/p5-Class-AutoClass/pkg-descr
+++ b/devel/p5-Class-AutoClass/pkg-descr
@@ -4,3 +4,7 @@ Class::AutoClass => similar to Class::MakeMethods, provides support for:
 	initilaization, 
   - object initialization is handled correctly (in top-down order), even
 	in the presence of multiple inheritance
+
+WWW: http://search.cpan.org/dist/autoclass
+Authors: Christopher Cavnor <ccavnor@systemsbiology.net>
+         Nat Goodman <natg@shore.net>