diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile
index 2308e98bbb90..ed6177d1e3a4 100644
--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@@ -1,40 +1,40 @@
-# Created by: Jose Garcia Juanino <jjuanino@gmail.com>
-
 PORTNAME=	powerarchitect
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTVERSION=	1.0.9
 CATEGORIES=	databases java
-MASTER_SITES=	http://download.sqlpower.ca/architect/1.0.8/community/
-DISTNAME=	SQL-Power-Architect-generic-jdbc-${PORTVERSION}
+MASTER_SITES=	http://www.bestofbi.com/downloads/architect/${PORTVERSION}/
+DISTNAME=	SQL-Power-Architect-generic-${PORTVERSION}
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Data modeling and profiling tool
 
 LICENSE=	GPLv3
 
 USE_JAVA=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	${PORTNAME}
 
 PORTDOCS=	*
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/architect-${PORTVERSION}
-SUB_FILES=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS MYSQL_JDBC PGSQL_JDBC
 
 MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 do-install:
-	@${MKDIR} ${STAGEDIR}/${DATADIR}/jdbc
+	@${MKDIR} ${STAGEDIR}/${DATADIR}
 	(cd ${WRKSRC}/ && \
-	    ${INSTALL_DATA} architect.jar ${STAGEDIR}/${DATADIR}/ && \
-	    ${INSTALL_DATA} jdbc/sqlserver_2005.jar ${STAGEDIR}/${DATADIR}/jdbc/ && \
-	    ${COPYTREE_SHARE} lib ${STAGEDIR}/${DATADIR})
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+		${INSTALL_DATA} architect.jar \
+		${STAGEDIR}/${DATADIR}/ && \
+		${COPYTREE_SHARE} lib ${STAGEDIR}/${DATADIR})
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
+		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.generic ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.generic \
+		${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/powerarchitect/distinfo b/databases/powerarchitect/distinfo
index d02603234702..8140c419cb90 100644
--- a/databases/powerarchitect/distinfo
+++ b/databases/powerarchitect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490528072
-SHA256 (SQL-Power-Architect-generic-jdbc-1.0.8.tar.gz) = 1e17e1f8b3277509d5e4e6dbc524831c7591c43b64c7f6c3b53044ebe741886b
-SIZE (SQL-Power-Architect-generic-jdbc-1.0.8.tar.gz) = 25106766
+TIMESTAMP = 1636225865
+SHA256 (SQL-Power-Architect-generic-1.0.9.tar.gz) = 2817d634965530792bf51a1d8b5d308b665915b94fa7a560612d4fbd21a6ef6f
+SIZE (SQL-Power-Architect-generic-1.0.9.tar.gz) = 27822585
diff --git a/databases/powerarchitect/pkg-descr b/databases/powerarchitect/pkg-descr
index 0bf0820ca8bb..580fb9e8d20e 100644
--- a/databases/powerarchitect/pkg-descr
+++ b/databases/powerarchitect/pkg-descr
@@ -1,12 +1,12 @@
 [ excerpt from developer's www site ]
 
 The Power*Architect is a user-friendly data modeling tool created by data
 warehouse designers, and has many unique features geared specifically for the
 data warehouse architect. It allows users to reverse-engineer existing
 databases, perform data profiling on source databases, and auto-generate ETL
 metadata.
 
 Plus, the Power*Architect has the ability to take snapshots of database
 structures, allowing users to design DW data models while working offline.
 
-WWW: http://software.sqlpower.ca/page/demos
+WWW: http://www.bestofbi.com/page/architect
diff --git a/databases/powerarchitect/pkg-plist b/databases/powerarchitect/pkg-plist
index b8136c283e04..2f46646d7b98 100644
--- a/databases/powerarchitect/pkg-plist
+++ b/databases/powerarchitect/pkg-plist
@@ -1,51 +1,53 @@
 bin/powerarchitect
 %%DATADIR%%/architect.jar
-%%DATADIR%%/jdbc/sqlserver_2005.jar
 %%DATADIR%%/lib/activation.jar
 %%DATADIR%%/lib/annotations.jar
 %%DATADIR%%/lib/apache-mime4j-0.6.jar
+%%DATADIR%%/lib/architecthelp.jar
 %%DATADIR%%/lib/commons-beanutils-bean-collections.jar
 %%DATADIR%%/lib/commons-beanutils-core.jar
 %%DATADIR%%/lib/commons-beanutils.jar
 %%DATADIR%%/lib/commons-codec-1.10.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-dbcp-1.2.2.jar
 %%DATADIR%%/lib/commons-digester.jar
 %%DATADIR%%/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/lib/commons-io-1.4.jar
 %%DATADIR%%/lib/commons-lang-2.4.jar
 %%DATADIR%%/lib/commons-logging.jar
 %%DATADIR%%/lib/commons-pool-1.5.1.jar
 %%DATADIR%%/lib/commons-vfs-1.0.jar
 %%DATADIR%%/lib/edtftpj-1.5.4.jar
 %%DATADIR%%/lib/eigenbase-properties.jar
 %%DATADIR%%/lib/forms-1.3.0.jar
 %%DATADIR%%/lib/guava-11.0.2.jar
+%%DATADIR%%/lib/hamcrest-core-1.3.jar
 %%DATADIR%%/lib/httpclient-4.0.jar
 %%DATADIR%%/lib/httpcore-4.0.1.jar
 %%DATADIR%%/lib/httpmime-4.0.jar
 %%DATADIR%%/lib/iText-2.0.8.jar
 %%DATADIR%%/lib/jakarta-regexp-1.2.jar
 %%DATADIR%%/lib/jcommon-1.0.0.jar
 %%DATADIR%%/lib/jfreechart-1.0.1.jar
 %%DATADIR%%/lib/jmdns-2.1.jar
 %%DATADIR%%/lib/jsr305.jar
-%%DATADIR%%/lib/junit-3.8.2.jar
+%%DATADIR%%/lib/junit-4.12.jar
 %%DATADIR%%/lib/kettle-core-3.2.2.jar
 %%DATADIR%%/lib/kettle-db-3.2.2.jar
 %%DATADIR%%/lib/kettle-engine-3.2.2.jar
 %%DATADIR%%/lib/log4j-1.2.15.jar
 %%DATADIR%%/lib/mail-1.4.1.jar
 %%DATADIR%%/lib/miglayout-3.7-swing.jar
 %%DATADIR%%/lib/olap4j-0.9.7.302.jar
 %%DATADIR%%/lib/opencsv-1.8.jar
+%%DATADIR%%/lib/osx_adapter.jar
 %%DATADIR%%/lib/piccolo.jar
 %%DATADIR%%/lib/piccolox.jar
 %%DATADIR%%/lib/rsyntaxtextarea.jar
 %%DATADIR%%/lib/servlet-api-3.0.jar
 %%DATADIR%%/lib/spring-core.jar
 %%DATADIR%%/lib/spring-security-core-2.0.5.RELEASE.jar
 %%DATADIR%%/lib/sqlpower_library.jar
 %%DATADIR%%/lib/velocity-1.6.2.jar
 %%DATADIR%%/lib/velocity-tools-generic-1.4.jar
 %%DATADIR%%/lib/xercesImpl-2.9.1.jar