diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 665493172e8..93c238ebeaa 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2010/11/15 00:22:54 espie Exp $
+# $OpenBSD: Makefile,v 1.54 2011/01/05 16:39:44 stu Exp $
 
 COMMENT-main=	embedded SQL implementation
 COMMENT-tcl=	TCL bindings for Sqlite3
@@ -8,6 +8,7 @@ DISTNAME=	sqlite-${V}
 PKGNAME-main=	sqlite3-${V}
 REVISION-main =	0
 PKGNAME-tcl=	sqlite3-tcl-${V}
+REVISION-tcl =	0
 PKGNAME-lemon=	lemon-${V}
 CATEGORIES=	databases
 SHARED_LIBS +=	sqlite3              14.0      # .8.6
@@ -33,12 +34,12 @@ CFLAGS+=	-DSQLITE_ENABLE_COLUMN_METADATA \
 #		-DSQLITE_ENABLE_FTS3=1
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--enable-threads-override-locks \
-		--enable-load-extension
+		--enable-threads-override-locks
 
 PSEUDO_FLAVORS=	no_tcl
 .if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
 FLAVOR?=
+CONFIGURE_ARGS +=	--enable-load-extension	
 .else
 FLAVOR=	no_tcl
 .endif
@@ -55,6 +56,7 @@ WANTLIB-tcl =	sqlite3
 
 .if ${MULTI_PACKAGES:M-tcl}
 CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR}
+CONFIGURE_ENV += TCLLIBDIR=${MODTCL_TCLDIR}/sqlite3
 
 REGRESS_TARGET=	test
 
diff --git a/databases/sqlite3/pkg/PFRAG.shared-tcl b/databases/sqlite3/pkg/PFRAG.shared-tcl
index 447970db4a4..84014176bf6 100644
--- a/databases/sqlite3/pkg/PFRAG.shared-tcl
+++ b/databases/sqlite3/pkg/PFRAG.shared-tcl
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared-tcl,v 1.2 2008/10/27 23:20:39 steven Exp $
-lib/tcl${MODTCL_VERSION}/sqlite3/libtclsqlite3.so
+@comment $OpenBSD: PFRAG.shared-tcl,v 1.3 2011/01/05 16:39:44 stu Exp $
+lib/tcl/sqlite3/libtclsqlite3.so
diff --git a/databases/sqlite3/pkg/PLIST-tcl b/databases/sqlite3/pkg/PLIST-tcl
index aaddf68ae43..f78ddd73b7c 100644
--- a/databases/sqlite3/pkg/PLIST-tcl
+++ b/databases/sqlite3/pkg/PLIST-tcl
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-tcl,v 1.2 2008/10/27 23:20:39 steven Exp $
+@comment $OpenBSD: PLIST-tcl,v 1.3 2011/01/05 16:39:44 stu Exp $
 %%SHARED%%
-lib/tcl${MODTCL_VERSION}/
-lib/tcl${MODTCL_VERSION}/sqlite3/
-lib/tcl${MODTCL_VERSION}/sqlite3/pkgIndex.tcl
+lib/tcl/
+lib/tcl/sqlite3/
+lib/tcl/sqlite3/pkgIndex.tcl