diff --git a/debian/changelog b/debian/changelog
index 21c2267816..88f3e93f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gtk+2.0 (2.12.3-2) unstable; urgency=low
+
+  * 092_notebook-critical-warnings.patch: Fix removal of tab labels to not
+    ref and unref a NULL pointer. Patch from upstream SVN, see BGO #388321.
+  * 093_directfb-type-changes.patch: Define __u32 and __u8 to fix compilation
+    with latest directfb from unstable while still supporting older versions.
+    Patch from BGO #503190.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 12 Dec 2007 05:36:40 +0100
+
 gtk+2.0 (2.12.3-1) unstable; urgency=low
 
   * Let update-icon-caches skip args which are not dirs or don't exist; fixes
diff --git a/debian/patches/092_notebook-critical-warnings.patch b/debian/patches/092_notebook-critical-warnings.patch
new file mode 100644
index 0000000000..3d55b16fa1
--- /dev/null
+++ b/debian/patches/092_notebook-critical-warnings.patch
@@ -0,0 +1,25 @@
+--- gtk-2-12/gtk/gtknotebook.c	2007/12/10 06:19:53	19139
++++ gtk-2-12/gtk/gtknotebook.c	2007/12/10 06:21:51	19140
+@@ -4349,12 +4349,15 @@
+   gtk_widget_unparent (page->child);
+ 
+   tab_label = page->tab_label;
+-  g_object_ref (tab_label);
+-  gtk_notebook_remove_tab_label (notebook, page);
+-  if (destroying)
+-    gtk_widget_destroy (tab_label);
+-  g_object_unref (tab_label);
+-  
++  if (tab_label)
++    {
++      g_object_ref (tab_label);
++      gtk_notebook_remove_tab_label (notebook, page);
++      if (destroying)
++        gtk_widget_destroy (tab_label);
++      g_object_unref (tab_label);
++    }
++
+   if (notebook->menu)
+     {
+       gtk_container_remove (GTK_CONTAINER (notebook->menu), 
+
diff --git a/debian/patches/093_directfb-type-changes.patch b/debian/patches/093_directfb-type-changes.patch
new file mode 100644
index 0000000000..7046944a30
--- /dev/null
+++ b/debian/patches/093_directfb-type-changes.patch
@@ -0,0 +1,24 @@
+Index: gtk+/gdk/directfb/gdkcursor-directfb.c
+===================================================================
+--- gtk+/gdk/directfb/gdkcursor-directfb.c	(Revision 19163)
++++ gtk+/gdk/directfb/gdkcursor-directfb.c	(Arbeitskopie)
+@@ -39,6 +39,19 @@
+ 
+ #include "x-cursors.xbm"
+ 
++
++/* Workaround for DirectFB >= 1.0.0-rc2 not
++ * defining __u32 anymore when DIRECTFB_NO_CRUFT
++ * is set, which is the default on Debian systems.
++ */
++#ifndef __u32
++#define __u32 u32
++#endif
++
++#ifndef __u8
++#define __u8 u8
++#endif
++
+ static struct {
+   const guchar *bits;
+   int width, height, hotx, hoty;
diff --git a/debian/patches/series b/debian/patches/series
index 6ee946ac0c..4bc522b771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,5 @@
 060_ignore-random-icons.patch
 070_mandatory-relibtoolize.patch
 091_workaround_no_gtk_init_incorrect_display.patch
+092_notebook-critical-warnings.patch
+093_directfb-type-changes.patch