diff --git a/databases/architect/Makefile b/databases/architect/Makefile
index 74a618863b2..5acd31cc29c 100644
--- a/databases/architect/Makefile
+++ b/databases/architect/Makefile
@@ -1,42 +1,37 @@
-# $OpenBSD: Makefile,v 1.11 2010/09/01 09:17:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/05/10 23:44:54 ian Exp $
 
 PKG_ARCH=		*
 
 COMMENT=		database exploration/builder written in Java
 
-V=			1.0.0
-DISTNAME=		Architect-generic-${V}
+V=			1.0.6
+DISTNAME=		SQL-Power-Architect-generic-jdbc-${V}
+MASTER_SITES=		http://power-architect.googlecode.com/files/
 PKGNAME=		architect-${V}
-REVISION=		3
 CATEGORIES=		databases
-WRKDIST=		${WRKDIR}	# no subdirectory
+WRKDIST=		${WRKDIR}/${PKGNAME}
 
 HOMEPAGE=		http://www.sqlpower.ca/page/architect
 
 MAINTAINER=		Ian Darwin <ian@openbsd.org>
 
-# Custom non-open-source license "...free for individual use" and 
-# "You may redistribute unmodified copies..." See $HOMEPAGE.
-PERMIT_PACKAGE_CDROM=	not allowed to charge a fee
+# GPLv3
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	not allowed to charge a fee
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://download.sqlpower.ca/architect/${V}/ \
-			ftp://ftp.darwinsys.com/pub/OpenBSD/distfiles/
-
 MODULES=		java
-MODJAVA_VER=	1.5+
+MODJAVA_VER =		1.6+
 
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/architect/jdbc
+	${INSTALL_DATA} ${WRKDIST}/jdbc/* ${PREFIX}/architect/jdbc
 	${INSTALL_DATA} ${WRKDIST}/architect.jar ${WRKDIST}/lib/* ${PREFIX}/architect/
-	${INSTALL_DATA} ${WRKDIST}/jdbc/default_database_types.ini ${PREFIX}/architect/jdbc
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/architect
-	${INSTALL_DATA} ${WRKDIST}/PowerArchitectUserGuide.pdf ${PREFIX}/share/doc/architect
 	${INSTALL_PROGRAM} ${FILESDIR}/architect ${PREFIX}/bin 
 
 .include <bsd.port.mk>
diff --git a/databases/architect/distinfo b/databases/architect/distinfo
index 68778a5ba6b..333f84d3ed3 100644
--- a/databases/architect/distinfo
+++ b/databases/architect/distinfo
@@ -1,5 +1,5 @@
-MD5 (Architect-generic-1.0.0.tar.gz) = TqUnXcxZVPnKMmxA3TupiA==
-RMD160 (Architect-generic-1.0.0.tar.gz) = RNCmj+zNLU73tN/vr2M1PSXonaU=
-SHA1 (Architect-generic-1.0.0.tar.gz) = ym3UIWT58FXBmTS931x87/S6cb4=
-SHA256 (Architect-generic-1.0.0.tar.gz) = iUenuZ8UYXB617ENmfC/2vxs+xMltUdxtEi1ZLu1B7Q=
-SIZE (Architect-generic-1.0.0.tar.gz) = 13770953
+MD5 (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = 1Dh9KFs70eo1CCouNT9ojg==
+RMD160 (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = 0ZlZ6S9sHNZfH6VqfCiNMrrinLw=
+SHA1 (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = Cm5ACqokM1X7gjJCX+lE3g5BeE8=
+SHA256 (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = JvA7a13IgAfp1nQL/FCjCjJIzuXF2kpSvycqiOpy6DE=
+SIZE (SQL-Power-Architect-generic-jdbc-1.0.6.tar.gz) = 23492992
diff --git a/databases/architect/pkg/MESSAGE b/databases/architect/pkg/MESSAGE
deleted file mode 100644
index bfb0f3df5c1..00000000000
--- a/databases/architect/pkg/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-To get started with the Architect, configure one or more Database
-Connections (right-click in the Navigator panel and choose New
-Connection...).  You may need to add one or more JDBC drivers; this
-is done under File->User Preferences->JDBC Drivers.
-
-Then, add your Connection to the Project and expand the database
-in the navigator; drag the parts you want to work on into the main
-panel. You can now begin visually inspecting/editing your database.
-Save your Project if you want to resume it later.
-
-Note: If you have used a version prior to 1.0 you may need to 
-re-configure your JDBC drivers and/or connections.
diff --git a/databases/architect/pkg/PLIST b/databases/architect/pkg/PLIST
index 0a737c8dcea..be20388605c 100644
--- a/databases/architect/pkg/PLIST
+++ b/databases/architect/pkg/PLIST
@@ -1,29 +1,62 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/04/11 19:34:09 ian Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/05/10 23:44:54 ian Exp $
 architect/
+architect/activation.jar
+architect/annotations.jar
+architect/apache-mime4j-0.6.jar
 architect/architect.jar
-architect/architecthelp.jar
 architect/commons-beanutils-bean-collections.jar
 architect/commons-beanutils-core.jar
 architect/commons-beanutils.jar
-architect/commons-collections-3.1.jar
-architect/commons-dbcp-1.2.1.jar
+architect/commons-codec-20041127.091804.jar
+architect/commons-collections-3.2.1.jar
+architect/commons-dbcp-1.2.2.jar
 architect/commons-digester.jar
+architect/commons-httpclient-3.1.jar
+architect/commons-io-1.4.jar
+architect/commons-lang-2.4.jar
 architect/commons-logging.jar
-architect/commons-pool-1.3.jar
-architect/darwinsys.jar
-architect/forms-1.0.6.jar
-architect/itext-1.4.8.jar
+architect/commons-pool-1.5.1.jar
+architect/commons-vfs-1.0.jar
+architect/edtftpj-1.5.4.jar
+architect/eigenbase-properties.jar
+architect/forms-1.3.0.jar
+architect/google-collect-1.0.jar
+architect/httpclient-4.0.jar
+architect/httpcore-4.0.1.jar
+architect/httpmime-4.0.jar
+architect/iText-2.0.8.jar
 architect/jakarta-regexp-1.2.jar
 architect/jcommon-1.0.0.jar
 architect/jdbc/
-architect/jdbc/default_database_types.ini
+architect/jdbc/hsqldb-1.8.0.9.jar
+architect/jdbc/mysql-connector-java-5.1.5-bin.jar
+architect/jdbc/mysql-connector-java-bin.jar
+architect/jdbc/postgresql-8.2-506.jdbc3.jar
+architect/jdbc/sqljdbc4-2.0.jar
+architect/jdbc/sqljdbc4-3.0.jar
+architect/jdbc/sqlserver_2005.jar
 architect/jfreechart-1.0.1.jar
-architect/jhall.jar
-architect/jlfgr-1_0.jar
-architect/jsearch.jar
-architect/log4j.jar
-architect/osx_adapter.jar
+architect/jmdns-2.1.jar
+architect/jsr305.jar
+architect/junit-3.8.2.jar
+architect/kettle-core-3.2.2.jar
+architect/kettle-db-3.2.2.jar
+architect/kettle-engine-3.2.2.jar
+architect/log4j-1.2.15.jar
+architect/mail-1.4.1.jar
+architect/miglayout-3.7-swing.jar
+architect/olap4j-0.9.7.302.jar
+architect/opencsv-1.8.jar
+architect/piccolo.jar
+architect/piccolox.jar
+architect/rsyntaxtextarea.jar
+architect/servlet-api-2.5.jar
+architect/spring-core.jar
+architect/spring-security-core-2.0.5.RELEASE.jar
 architect/sqlpower_library.jar
+architect/velocity-1.6.2.jar
+architect/velocity-tools-generic-1.4.jar
+architect/xercesImpl-2.9.1.jar
 bin/architect
 share/doc/architect/
-share/doc/architect/PowerArchitectUserGuide.pdf
+share/doc/pkg-readmes/${FULLPKGNAME}
diff --git a/databases/architect/pkg/README b/databases/architect/pkg/README
new file mode 100644
index 00000000000..3f28497101a
--- /dev/null
+++ b/databases/architect/pkg/README
@@ -0,0 +1,3 @@
+To get started with SQL Power*Architect, please see the
+Getting Started wiki page at
+http://code.google.com/p/power-architect/wiki/GettingStarted