diff -u swt-gtk-3.4/make_linux.mak swt-gtk-3.4/make_linux.mak
--- swt-gtk-3.4/make_linux.mak
+++ swt-gtk-3.4/make_linux.mak
@@ -50,7 +50,7 @@
 
 CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
 
-AWT_LIB_PATH=/usr/lib/jvm/default-java/lib
+AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(DEB_HOST_ARCH_CPU)
 AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared
 
 ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
diff -u swt-gtk-3.4/debian/control swt-gtk-3.4/debian/control
--- swt-gtk-3.4/debian/control
+++ swt-gtk-3.4/debian/control
@@ -1,9 +1,10 @@
 Source: swt-gtk
 Section: libs
 Priority: optional
-Maintainer: Shaun Jackman <sjackman@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Shaun Jackman <sjackman@debian.org>
 Build-Depends: default-jdk-builddep, libgnomeui-dev, libxtst-dev,
- xulrunner-dev, libxcb-render-util0-dev,
+ xulrunner-dev, libxcb-render-util0-dev, libxt-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  fastjar, cdbs, patchutils, debhelper
 Standards-Version: 3.8.0.1
@@ -49,7 +50,7 @@
 Package: libswt-mozilla-gtk-3.4-jni
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, xulrunner
 Conflicts: libswt3.4-gtk-jni
 Description: Standard Widget Toolkit for GTK+ Mozilla JNI library
  The SWT component is designed to provide efficient, portable access to
diff -u swt-gtk-3.4/debian/changelog swt-gtk-3.4/debian/changelog
--- swt-gtk-3.4/debian/changelog
+++ swt-gtk-3.4/debian/changelog
@@ -1,3 +1,15 @@
+swt-gtk (3.4-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #307020), Ubuntu remaining changes:
+    - Build-depend on libxt-dev, fixes FTBFS.
+  * make_linux.mak:
+    - Fixed AWT_LIB_PATH, fixes FTBFS.
+  * debian/control:
+    - libswt-mozilla-gtk-3.4-jni depends on xulrunner (LP: #259606),
+      thanks to Stefano Maioli.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 11 Dec 2008 01:28:07 +0100
+
 swt-gtk (3.4-2) unstable; urgency=low
 
   * Build and install the GLX library. Closes: #497119.
@@ -8,6 +20,13 @@
 
  -- Shaun Jackman <sjackman@debian.org>  Fri, 21 Nov 2008 22:14:13 -0800
 
+swt-gtk (3.4-1ubuntu1) intrepid; urgency=low
+
+  * Build-depend on libxt-dev to fix FTBFS.
+  * Changed Debian maintainer field.
+
+ -- Matvey Kozhev <sikon@ubuntu.com>  Sat, 02 Aug 2008 15:29:32 +0700
+
 swt-gtk (3.4-1) unstable; urgency=low
 
   * New upstream release. Closes: #490214.