diff -Nru basic256-0.9.6.48/debian/changelog basic256-0.9.6.48/debian/changelog
--- basic256-0.9.6.48/debian/changelog	2010-11-16 18:14:50.000000000 +0100
+++ basic256-0.9.6.48/debian/changelog	2010-11-24 10:56:01.000000000 +0100
@@ -1,3 +1,11 @@
+basic256 (0.9.6.48-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #680841). Remaining changes:
+    - debian/control: Build-Depend on libqtwebkit-dev. It has separated from
+      libqt-dev. Fixes FTBFS
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 24 Nov 2010 10:52:48 +0100
+
 basic256 (0.9.6.48-1) unstable; urgency=low
 
   * Imported Upstream version 0.9.6.48
@@ -6,6 +14,13 @@
 
  -- Ryan Kavanagh <ryanakca@kubuntu.org>  Tue, 16 Nov 2010 12:14:42 -0500
 
+basic256 (0.9.6.32-1ubuntu1) natty; urgency=low
+
+  * debian/control: Build-Depend on libqtwebkit-dev. It has separated from
+    libqt-dev. Fixes FTBFS (LP: #664209)
+
+ -- Roy Jamison <xteejyx@googlemail.com>  Thu, 21 Oct 2010 00:39:18 +0200
+
 basic256 (0.9.6.32-1) unstable; urgency=low
 
   * New upstream release
diff -Nru basic256-0.9.6.48/debian/control basic256-0.9.6.48/debian/control
--- basic256-0.9.6.48/debian/control	2010-11-16 18:14:23.000000000 +0100
+++ basic256-0.9.6.48/debian/control	2010-11-24 08:03:48.000000000 +0100
@@ -1,7 +1,8 @@
 Source: basic256
 Section: devel
 Priority: optional
-Maintainer: Ryan Kavanagh <ryanakca@kubuntu.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ryan Kavanagh <ryanakca@kubuntu.org>
 Build-Depends: debhelper (>= 7.0.50~),
  bison,
  flex,
@@ -10,7 +11,8 @@
  libqt4-dev,
  libsdl1.2-dev,
  libsdl-mixer1.2-dev,
- libsqlite3-dev
+ libsqlite3-dev,
+ libqtwebkit-dev
 Standards-Version: 3.9.1
 Homepage: http://www.basic256.org/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/basic256.git