diff --git a/dev-db/postgresql/licenses/PostgreSQL b/dev-db/postgresql/licenses/PostgreSQL
new file mode 100644
index 000000000..b773b4d9c
--- /dev/null
+++ b/dev-db/postgresql/licenses/PostgreSQL
@@ -0,0 +1,23 @@
+PostgreSQL Database Management System
+(formerly known as Postgres, then as Postgres95)
+
+Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+
+Portions Copyright (c) 1994, The Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement
+is hereby granted, provided that the above copyright notice and this
+paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/dev-db/postgresql/patches/postgresql-9.0.4.patch b/dev-db/postgresql/patches/postgresql-9.0.4.patch
new file mode 100644
index 000000000..651ad6111
--- /dev/null
+++ b/dev-db/postgresql/patches/postgresql-9.0.4.patch
@@ -0,0 +1,19 @@
+diff -urN postgresql-9.0.4/configure.in postgresql-9.0.4-haiku/configure.in
+--- postgresql-9.0.4/configure.in	2011-04-15 03:15:53.000000000 +0000
++++ postgresql-9.0.4-haiku/configure.in	2011-07-15 16:30:31.934543360 +0000
+@@ -861,7 +861,7 @@
+ AC_CHECK_LIB(m, main)
+ AC_SEARCH_LIBS(setproctitle, util)
+ AC_SEARCH_LIBS(dlopen, dl)
+-AC_SEARCH_LIBS(socket, [socket wsock32])
++AC_SEARCH_LIBS(socket, [socket wsock32 network])
+ AC_SEARCH_LIBS(shl_load, dld)
+ # We only use libld in port/dynloader/aix.c
+ case $host_os in
+diff -urN postgresql-9.0.4/src/template/haiku postgresql-9.0.4-haiku/src/template/haiku
+--- postgresql-9.0.4/src/template/haiku	1970-01-01 00:00:00.000000000 +0000
++++ postgresql-9.0.4-haiku/src/template/haiku	2011-07-15 16:26:54.707264512 +0000
+@@ -0,0 +1,3 @@
++case $host_os in
++  haiku*) ;;
++esac
diff --git a/dev-db/postgresql/postgresql-9.0.4.bep b/dev-db/postgresql/postgresql-9.0.4.bep
new file mode 100644
index 000000000..dc88cb0b8
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.0.4.bep
@@ -0,0 +1,27 @@
+DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system." 
+HOMEPAGE="http://www.postgresql.org/" 
+SRC_URI="http://wwwmaster.postgresql.org/redir/198/f/source/v9.0.4/postgresql-9.0.4.tar.bz2"
+REVISION="1"
+STATUS_HAIKU="broken"
+DEPEND="dev-libs/libedit >= 20100424"
+CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29"
+BUILD {
+	cd postgresql-9.0.4
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku
+	make
+}
+
+INSTALL {
+	cd postgresql-9.0.4
+	make install
+}
+
+TEST {
+	cd postgresql-9.0.4
+#	make test
+#	make check
+}
+
+LICENSE="PostgreSQL"
+COPYRIGHT="1996-2010, PostgreSQL Global Development Group
+	1994, The Regents of the University of California"