diff --git a/debian/changelog b/debian/changelog
index 9118c6d..59a3392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bansheelyricsplugin (0.7-1ubuntu1) karmic-proposed; urgency=low
+
+  * debian/patches/01_fix-nullptr.patch:
+    + Fix null String being passed to Gtk.HTMLStream (LP: #511868)
+  * debian/control, debian/rules:
+    + Quiltify
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Sat, 06 Feb 2010 23:15:19 +0800
+
 bansheelyricsplugin (0.7-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index 05bf2d5..8f80518 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyperair@gmail.com>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 7.0.50),
+               quilt (>= 0.46-7~),
                cli-common-dev (>= 0.5.7),
                pkg-config (>= 0.9.0),
                mono-devel (>= 2.0.1),
diff --git a/debian/patches/01_fix-nullptr.patch b/debian/patches/01_fix-nullptr.patch
new file mode 100644
index 0000000..cddb8e2
--- /dev/null
+++ b/debian/patches/01_fix-nullptr.patch
@@ -0,0 +1,24 @@
+Description: Catch null strings prior to passing into Gtk.HTMLStream
+Origin: upstream
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/511868
+Index: bansheelyricsplugin/src/Banshee.Lyrics.Gui/LyricsBrowser.cs
+===================================================================
+--- bansheelyricsplugin.orig/src/Banshee.Lyrics.Gui/LyricsBrowser.cs	2010-02-06 22:56:44.854671505 +0800
++++ bansheelyricsplugin/src/Banshee.Lyrics.Gui/LyricsBrowser.cs	2010-02-06 22:57:35.712670652 +0800
+@@ -137,6 +137,9 @@
+         public void LoadString (string str)
+         {
+             HTMLStream html_stream = this.htmlBrowser.Begin ("text/html; charset=utf-8");
++            if (str == null) {
++                str = " ";
++            }
+             html_stream.Write (str);
+             this.htmlBrowser.End (html_stream, HTMLStreamStatus.Ok);
+         }
+@@ -183,4 +186,4 @@
+             menu.Popup ();
+         }
+     }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cea2f1e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-nullptr.patch 
diff --git a/debian/rules b/debian/rules
index 94f586a..03aed7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh $@
+	dh --with=quilt $@
 
 .PHONY: get-orig-source