diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 7c9a2f38c1c0..36d7775e7542 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	rar
-PORTVERSION=	3.20
+PORTVERSION=    3.30
 PORTEPOCH=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.rarlab.com/rar/
-DISTNAME=	rarbsd-3.2.0
+MASTER_SITES=   http://files10.rarlab.com/rar/
+DISTNAME=       rarbsd-3.3.0
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	File archiver (binary port)
 
 CAT1=		rar.1
 
-FETCH_CMD=	/usr/bin/fetch
+CONFLICTS=      unrar-*
 ONLY_FOR_ARCHS=	i386
 NO_PACKAGE=	Only unmodified original package can be distributed
 NO_BUILD=	yes
@@ -30,19 +30,21 @@ STRIP=
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/rar
 	${INSTALL_PROGRAM} ${WRKSRC}/rar ${PREFIX}/bin/rar
 	${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin/unrar
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} rar.txt ${PREFIX}/man/cat1/rar.1 && \
-		${INSTALL_DATA} rar_faq.txt technote.txt license.txt \
-				rar_site.txt register.txt order.txt \
-				readme.txt rereg.txt whatsnew.txt \
-				file_id.diz \
-			${PREFIX}/share/doc/rar && \
 		${INSTALL_DATA} rarfiles.lst \
 			${PREFIX}/etc && \
 		${INSTALL_DATA} default.sfx \
 			${PREFIX}/lib
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} rar_faq.txt technote.txt license.txt \
+				order.htm readme.txt whatsnew.txt \
+				file_id.diz \
+			${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/archivers/rar/distinfo b/archivers/rar/distinfo
index 6dcbe93f9cdd..c96219d0105f 100644
--- a/archivers/rar/distinfo
+++ b/archivers/rar/distinfo
@@ -1 +1 @@
-MD5 (rarbsd-3.2.0.tar.gz) = 64c510e47a728c9f9c1b923322768881
+MD5 (rarbsd-3.3.0.tar.gz) = 9a2c284d72a9d473e20275b7785f1119
diff --git a/archivers/rar/pkg-plist b/archivers/rar/pkg-plist
index 336cfed09211..8ddc1b463b32 100644
--- a/archivers/rar/pkg-plist
+++ b/archivers/rar/pkg-plist
@@ -2,14 +2,11 @@ bin/rar
 bin/unrar
 lib/default.sfx
 etc/rarfiles.lst
-%%DOCSDIR%%/technote.txt
-%%DOCSDIR%%/rar_faq.txt
-%%DOCSDIR%%/rar_site.txt
-%%DOCSDIR%%/license.txt
-%%DOCSDIR%%/whatsnew.txt
-%%DOCSDIR%%/rereg.txt
-%%DOCSDIR%%/register.txt
-%%DOCSDIR%%/order.txt
-%%DOCSDIR%%/readme.txt
-%%DOCSDIR%%/file_id.diz
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/technote.txt
+%%PORTDOCS%%%%DOCSDIR%%/rar_faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
+%%PORTDOCS%%%%DOCSDIR%%/order.htm
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/file_id.diz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%