diff --git a/database/postgresql/config.hlp b/database/postgresql/config.hlp
index ac2c68cb8..b880ff2b5 100644
--- a/database/postgresql/config.hlp
+++ b/database/postgresql/config.hlp
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../postgresql/config.hlp
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -26,3 +26,8 @@ SDECFG_PKG_POSTGRESQL_CONTRIB
   within the PostgreSQL package should be build and installed.
 
   Default: Yes
+
+SDECFG_PKG_POSTGRESQL_CLIENTONLY
+  Enable this option if you want to have a PostgreSQL client only package.
+
+  Default: No
diff --git a/database/postgresql/config.in b/database/postgresql/config.in
index 469370930..8977db3d3 100644
--- a/database/postgresql/config.in
+++ b/database/postgresql/config.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../postgresql/config.in
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -22,5 +22,8 @@ then
 	bool "Include PostgreSQL contributed 3rd. Party Applications" \
 		SDECFG_PKG_POSTGRESQL_CONTRIB	1
 
+	bool "Install only PostgreSQL libraries and client" \
+		SDECFG_PKG_POSTGRESQL_CLIENTONLY   0
+
 	menu_end
 fi
diff --git a/database/postgresql/postgresql.conf b/database/postgresql/postgresql.conf
index d269d4fb8..9edc0ed05 100644
--- a/database/postgresql/postgresql.conf
+++ b/database/postgresql/postgresql.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../postgresql/postgresql.conf
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -23,6 +23,15 @@ if [ $prefix_auto = 1 ] ; then
         set_confopt
 fi
 
+if [ "$SDECFG_PKG_POSTGRESQL_CLIENTONLY" == 1 ]; then
+	makeinstopt=
+	hook_add postmake 5 "postgresqlclient_pm"
+else
+	hook_add postmake 5 "postgresql_pm"
+fi
+
+
+
 # check if we should build and install the contributed 3rd. party
 # applications and tools
 [ "$SDECFG_PKG_POSTGRESQL_CONTRIB" == 0 ] ||
@@ -47,6 +56,18 @@ for x in readline; do
 	fi
 done
 
+# Do not build internal TZData if external is installed
+if pkginstalled tzdata ; then
+	pkgprefix -t tzdata
+	var_append extraconfopt " " "--with-system-tzdata=$( pkgprefix datadir tzdata )/zoneinfo"
+fi
+
+postgresqlclient_pm() {
+	for x in src/{bin,include,interfaces} doc; do
+		eval $MAKE $makeopt -C $x install
+	done
+}
+
 postgresql_pm() {
 	# Create the data directory
 	mkdir -p $root/$localstatedir/data
@@ -59,5 +80,3 @@ postgresql_pm() {
 	EOT
 }
 
-hook_add postmake 5 "postgresql_pm"
-