diff --git a/debian/changelog b/debian/changelog
index 1b550ce..30098a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 orafce (3.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Built against PostgreSQL 8.4 (closes: #559585)
 
  -- Peter Eisentraut <petere@debian.org>  Sat, 27 Mar 2010 14:44:40 +0200
 
diff --git a/debian/control b/debian/control
index f6b26fb..d0d6304 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@
 Section: misc
 Priority: optional
 Maintainer: Peter Eisentraut <petere@debian.org>
-Build-Depends: bison, cdbs, debhelper (>= 5), flex, postgresql-server-dev-8.3
+Build-Depends: bison, cdbs, debhelper (>= 5), flex, postgresql-server-dev-8.4
 Standards-Version: 3.8.0
 Homepage: http://orafce.projects.postgresql.org/
 Vcs-Svn: svn://svn.debian.org/pkg-postgresql/trunk/orafce/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-postgresql/trunk/orafce/
 
-Package: postgresql-8.3-orafce
+Package: postgresql-8.4-orafce
 Architecture: any
-Depends: ${shlibs:Depends}, postgresql-8.3
+Depends: ${shlibs:Depends}, postgresql-8.4
 Description: Oracle support functions for PostgreSQL
  This project implements some functions for compatibility with Oracle.
  The functionality was verified on Oracle 10g, and the module is
diff --git a/debian/postgresql-8.3-orafce.lintian-overrides b/debian/postgresql-8.3-orafce.lintian-overrides
deleted file mode 100644
index b5b80cd..0000000
--- a/debian/postgresql-8.3-orafce.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-postgresql-8.3-orafce: package-contains-upstream-install-documentation usr/share/doc/postgresql-8.3-orafce/INSTALL.orafunc
diff --git a/debian/postgresql-8.4-orafce.lintian-overrides b/debian/postgresql-8.4-orafce.lintian-overrides
new file mode 100644
index 0000000..228b6c6
--- /dev/null
+++ b/debian/postgresql-8.4-orafce.lintian-overrides
@@ -0,0 +1 @@
+postgresql-8.4-orafce: package-contains-upstream-install-documentation usr/share/doc/postgresql-8.4-orafce/INSTALL.orafunc
diff --git a/debian/rules b/debian/rules
index e4801c5..d2684ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,11 @@
 include /usr/share/cdbs/1/class/makefile.mk
 
 export USE_PGXS=1
-export PATH:=/usr/lib/postgresql/8.3/bin:$(PATH)
+export PATH:=/usr/lib/postgresql/8.4/bin:$(PATH)
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
 
-DEB_INSTALL_DOCS_postgresql-8.3-orafce = INSTALL.orafunc README.orafunc
-DEB_DH_MAKESHLIBS_ARGS_postgresql-8.3-orafce = -n
+DEB_INSTALL_DOCS_postgresql-8.4-orafce = INSTALL.orafunc README.orafunc
 
-binary-post-install/postgresql-8.3-orafce::
-	rm -r $(DEB_DESTDIR)/usr/share/doc/postgresql-doc-8.3/
+binary-post-install/postgresql-8.4-orafce::
+	rm -r $(DEB_DESTDIR)/usr/share/doc/postgresql/