Index: security/keepassx2/Makefile
===================================================================
--- security/keepassx2/Makefile	(revision 399801)
+++ security/keepassx2/Makefile	(working copy)
@@ -1,13 +1,12 @@
 # Created by: Eric Camachat <eric@camachat.org>
 # $FreeBSD$
 
-PORTNAME=	KeePassX
-DISTVERSION=	2.0
-PORTREVISION=	3
+PORTNAME=	keepassx
+PORTVERSION=	2.0.b2
+PKGNAMESUFFIX=	2
 CATEGORIES=	security
-MASTER_SITES=	https://www.keepassx.org/dev/attachments/download/69/
-PKGNAMESUFFIX=	-alpha
-DISTNAME=	${PORTNAME:tl}-${DISTVERSION}${PKGNAMESUFFIX}6
+MASTER_SITES=	https://www.keepassx.org/dev/attachments/download/115/
+DISTNAME=	${PORTNAME}-2.0-beta2
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Cross Platform Password Manager
@@ -16,14 +15,14 @@
 
 CONFLICTS_INSTALL=	keepassx-0.*
 
-DATADIR=	${PREFIX}/share/${PORTNAME:tl}
-WRKSRC=		${WRKDIR}/${DISTNAME:tl}
+DATADIR=	${PREFIX}/share/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.0-beta2
 
 USES=		cmake
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_QT4=	corelib gui xml qtestlib dbus uic_build moc_build \
-		qmake_build rcc_build
+USE_QT4=	corelib gui xml qtestlib uic_build moc_build \
+		qmake_build rcc_build linguisttools
 USE_XORG=	xt inputproto xtst xrender xrandr xfixes xcursor \
 		xext x11 sm ice xi
 
Index: security/keepassx2/distinfo
===================================================================
--- security/keepassx2/distinfo	(revision 399801)
+++ security/keepassx2/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (keepassx-2.0-alpha6.tar.gz) = 592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0
-SIZE (keepassx-2.0-alpha6.tar.gz) = 1366929
+SHA256 (keepassx-2.0-beta2.tar.gz) = 5828261226c441856bd12e2f4f73af1a5fc3b1981b2cff40fbc2403e344f4e52
+SIZE (keepassx-2.0-beta2.tar.gz) = 1479599
\ No newline at end of file
Index: UPDATING
===================================================================
--- UPDATING	(revision 399801)
+++ UPDATING	(working copy)
@@ -5,6 +5,15 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20151020:
+  AFFECTS: users of security/keepassx2
+
+  In order of package name changed, please remove old install before
+  upgrade.
+
+  # pkg delete security/keepassx2
+  # portmaster security/keepassx2
+
 20151019:
   AFFECTS: users of www/varnish4
   AUTHOR: feld@FreeBSD.org