diff --git a/www/aria/Makefile b/www/aria/Makefile
index 550e9f4bad03..d24781f21761 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -1,54 +1,58 @@
 # New ports collection makefile for:   aria
 # Date created:        30 March 2001
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aria
 PORTVERSION=	1.0.0
 PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://aria.rednoah.com/storage/sources/
+MASTER_SITES=	SF/aria-rpm
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Yet another download tool
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 USE_GNOME=	gnometarget gtk12
 USE_OPENSSL=	yes
-USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+PORTDOCS=	README README.euc
 
 CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 LDFLAGS=	-L${LOCALBASE}/lib
 
 post-extract:
 	@${RM} -f ${WRKSRC}/src/getopt*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|-lssl|-lcrypto -lssl|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| -O2 -Wall | @CXXFLAGS@ |g ; \
 		s|getopt.c getopt1.c getopt.h||g ; \
 		s|getopt.o getopt1.o||g ; \
 		s|\.deps/getopt.P ||g ; \
 		s|\.deps/getopt1.P ||g' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's| -O2 -Wall | @CXXFLAGS@ |g' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|"getopt.h"|<getopt.h>|g' \
 		${WRKSRC}/src/main.cc
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.euc ${DOCSDIR}
+	@${INSTALL} -d ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/aria/pkg-plist b/www/aria/pkg-plist
index 8a584188da9c..d4f3b74e8f02 100644
--- a/www/aria/pkg-plist
+++ b/www/aria/pkg-plist
@@ -1,22 +1,19 @@
 bin/aria
-share/aria/command.aria
-share/aria/command.aria.template.gz
-share/aria/rc.aria
-share/aria/server.aria
-share/aria/server.aria.template.euc.gz
-share/aria/server.aria.template.gz
-share/aria/useragent.aria
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.euc
-share/locale/cs/LC_MESSAGES/aria.mo
-share/locale/de/LC_MESSAGES/aria.mo
-share/locale/es/LC_MESSAGES/aria.mo
-share/locale/fr/LC_MESSAGES/aria.mo
-share/locale/hu/LC_MESSAGES/aria.mo
-share/locale/it/LC_MESSAGES/aria.mo
-share/locale/ja/LC_MESSAGES/aria.mo
-share/locale/pl/LC_MESSAGES/aria.mo
-share/locale/ru/LC_MESSAGES/aria.mo
-share/locale/zh_TW/LC_MESSAGES/aria.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/aria
+%%DATADIR%%/command.aria
+%%DATADIR%%/command.aria.template.gz
+%%DATADIR%%/rc.aria
+%%DATADIR%%/server.aria
+%%DATADIR%%/server.aria.template.euc.gz
+%%DATADIR%%/server.aria.template.gz
+%%DATADIR%%/useragent.aria
+%%NLS%%share/locale/cs/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/de/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/es/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/it/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/aria.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/aria.mo
+@dirrm %%DATADIR%%