diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index a9c5580321a8..09564ef979b7 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -1,48 +1,45 @@
 # ex:ts=8
 # New ports collection makefile for:	autodia
 # Date created:			Oct 6, 2001
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	autodia
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 PORTREVISION=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://droogs.org/autodia/download/
-DISTNAME=	AutoDia-${PORTVERSION}
+DISTNAME=	Autodia-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${PERL_SITELIBDIR}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${PERL_SITELIBDIR}/Inline.pm:${PORTSDIR}/devel/p5-Inline \
 		${PERL_SITELIBDIR}/Inline/Java.pm:${PORTSDIR}/devel/p5-Inline-Java
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-USE_BZIP2=	yes
 PERL_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/Autodia
 
-MAN1=	autodia.1
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Autodia.3 Autodia::Diagram.3 Autodia::Diagram::Class.3 \
-	Autodia::Diagram::Component.3 Autodia::Handler.3 \
-	Autodia::Handler::Cpp.3 Autodia::Handler::PHP.3 \
+MAN3=	Autodia.3 autodia.3 autodia_java.3 Autodia::Diagram.3 \
+	Autodia::Diagram::Class.3 Autodia::Diagram::Component.3 \
+	Autodia::Handler.3 Autodia::Handler::Cpp.3 Autodia::Handler::PHP.3 \
 	Autodia::Handler::Perl.3
 
 DOCS=	CHANGES COPYING CREDITS DEVELOP FAQ INSTALL README
 
 pre-install:
 	@${RM} -f ${WRKSRC}/blib/man3/*.3pm
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/autodia/distinfo b/devel/autodia/distinfo
index 1af0b2c857ac..2969470d449e 100644
--- a/devel/autodia/distinfo
+++ b/devel/autodia/distinfo
@@ -1 +1 @@
-MD5 (AutoDia-1.2.tar.bz2) = d08725640718036a5e490ab0c7431056
+MD5 (Autodia-1.3.tar.gz) = 4f3cf8c2aa81df384d961027b67a2462
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index 18c2c031dc69..13ab71e7309f 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -1,24 +1,30 @@
-bin/autodia
+bin/autodia.pl
+bin/autodia_java.pl
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Class.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Component.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Dependancy.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Inheritance.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Object.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Superclass.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Cpp.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Java.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Perl.pm
+lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/PHP.pm
 lib/perl5/site_perl/%%PERL_VER%%/Autodia.pm
+lib/perl5/site_perl/%%PERL_VER%%/autodia.pl
+lib/perl5/site_perl/%%PERL_VER%%/autodia_java.pl
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Autodia/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Autodia
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia
 %%PORTDOCS%%share/doc/autodia/CHANGES
 %%PORTDOCS%%share/doc/autodia/COPYING
 %%PORTDOCS%%share/doc/autodia/CREDITS
 %%PORTDOCS%%share/doc/autodia/DEVELOP
 %%PORTDOCS%%share/doc/autodia/FAQ
 %%PORTDOCS%%share/doc/autodia/INSTALL
 %%PORTDOCS%%share/doc/autodia/README
 %%PORTDOCS%%@dirrm share/doc/autodia