diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 68fd7789f04d..79987b2297b4 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/03/20 19:49:16 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/20 19:51:40 joerg Exp $
 #
 
 DISTNAME=		gtksql-0.3
@@ -14,7 +14,7 @@ HOMEPAGE=		http://www.multimania.com/bbrox/GtkSQL/
 COMMENT=		Query tool for PostgreSQL written with GTK
 
 USE_X11BASE=		yes
-MAKE_ENV+=		MCFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+=		MCFLAGS=${CFLAGS:M*:Q} PGSQL_PREFIX=${PGSQL_PREFIX:Q}
 
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo
index 7694f63144fe..455aa33206ff 100644
--- a/databases/gtksql/distinfo
+++ b/databases/gtksql/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/03/20 19:49:16 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/03/20 19:51:40 joerg Exp $
 
 SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c
 RMD160 (gtksql-0.3.tar.gz) = e05cb980ce29c44b37eaafc43e9161fb281b2a9d
 Size (gtksql-0.3.tar.gz) = 50557 bytes
-SHA1 (patch-aa) = 20d7ecc45cc81c15c11a32c8cd2a58638771988f
+SHA1 (patch-aa) = 01961207b8bcb6a60da2224a8bf07160d660c0c6
 SHA1 (patch-ab) = 0d194dd153e3d3ce34b0f0d805ae0d83408de33b
diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa
index 0d867502e4f7..620ab718db4b 100644
--- a/databases/gtksql/patches/patch-aa
+++ b/databases/gtksql/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2006/03/20 19:49:17 joerg Exp $
+$NetBSD: patch-aa,v 1.12 2006/03/20 19:51:40 joerg Exp $
 
 --- Makefile.orig	Sat Jun  5 06:05:36 1999
 +++ Makefile
@@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.11 2006/03/20 19:49:17 joerg Exp $
  # Here, what you need for PostgreSQL
 -PGSQLIBS    = -L/usr/local/pgsql/lib -lpq
 -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL
-+PGSQLIBS    = -L${PREFIX}/lib -lpq
-+PGSQLCFLAGS = -I${PREFIX}/include/postgresql/server -DUSE_POSTGRESQL
++PGSQLIBS    = -L${PGSQL_PREFIX}/lib -lpq
++PGSQLCFLAGS = -I${PGSQL_PREFIX}/include/postgresql/server -DUSE_POSTGRESQL
  PGSQLOBJS   = postgres.o
  
  # Here, what you need for MySQL