diff -u dbus-java-2.5/debian/control dbus-java-2.5/debian/control
--- dbus-java-2.5/debian/control
+++ dbus-java-2.5/debian/control
@@ -1,8 +1,8 @@
 Source: dbus-java
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Matthew Johnson <mjj29@debian.org>
-Build-Depends: sun-java6-jdk,
+Build-Depends: openjdk-6-jdk,
                debhelper (>= 5.0.0),
                docbook-to-man,
                tex4ht,
@@ -19,7 +19,7 @@
 
 Package: libdbus-java
 Architecture: all
-Section: contrib/libs
+Section: libs
 Depends: ${java:Depends}, ${misc:Depends}
 Suggests: libdbus-java-doc
 Recommends: dbus-java-bin
@@ -34,7 +34,7 @@
 
 Package: dbus-java-bin
 Architecture: all
-Section: contrib/utils
+Section: utils
 Depends: ${java:Depends}, ${misc:Depends}, libdbus-java (= ${binary:Version})
 Conflicts: libdbus-java (<< 2.0)
 Replaces: libdbus-java (<< 2.0)
@@ -54,7 +54,7 @@
 Recommends: libdbus-java
 Depends: classpath-doc, ${misc:Depends}
 Architecture: all
-Section: contrib/doc
+Section: doc
 Description: simple interprocess messaging system (Java interface documentation)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
diff -u dbus-java-2.5/debian/changelog dbus-java-2.5/debian/changelog
--- dbus-java-2.5/debian/changelog
+++ dbus-java-2.5/debian/changelog
@@ -1,3 +1,9 @@
+dbus-java (2.5-1.1) unstable; urgency=low
+
+  * Use OpenJDK to build so dbus-java can be moved to main (Closes: #490812)
+
+ -- Sveinung Kvilhaugsvik <sveinung84@users.sorceforge.net>  Mon, 14 Jul 2008 10:32:40 +0000
+
 dbus-java (2.5-1) unstable; urgency=low
 
   * New Upstream Release
diff -u dbus-java-2.5/debian/rules dbus-java-2.5/debian/rules
--- dbus-java-2.5/debian/rules
+++ dbus-java-2.5/debian/rules
@@ -6,7 +6,7 @@
 LOCALE_DIR=debian/locale
 LOCALE_NAME=en_GB
 LOCALE_CHARSET=UTF-8
-JAVA_HOME=/usr/lib/jvm/java-6-sun
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 build: build-stamp
 
@@ -64,7 +64,7 @@
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_install -i --sourcedir=debian/tmp
-	jh_depends -pdbus-java-bin -jsun
+	jh_depends -pdbus-java-bin -jopen
 	jh_depends -plibdbus-java 
 	dh_compress -i -X.pdf
 	dh_fixperms -i