diff --git a/ChangeLog b/ChangeLog
index dac32a69fa..84367359c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-20  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>
+
+        Merge from trunk:
+
+        * gdk/directfb/gdkwindow-directfb.c:
+        * gdk/directfb/gdkdirectfb.h: Updated minimum DirectFB version
+        required to enable gdk_directfb_create_child_window.
+        (Closes: #437379)
+
 2007-05-18  Carlos Garnacho  <carlos@imendio.com>
 
 	Refactor GtkFileChooserDialog sizing.
diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h
index 05a2b8624d..bf34802090 100644
--- a/gdk/directfb/gdkdirectfb.h
+++ b/gdk/directfb/gdkdirectfb.h
@@ -86,7 +86,7 @@ GdkVisual * gdk_directfb_visual_by_format   (DFBSurfacePixelFormat  pixel_format
 IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
 IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
 
-#if (DIRECTFB_MICRO_VERSION > 25)
+#if (DIRECTFB_MAJOR_VERSION >= 1)
 GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
                 IDirectFBSurface *subsurface);
 #endif
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 951e2d683d..c48064865b 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -2506,7 +2506,7 @@ gdk_window_get_frame_extents (GdkWindow    *window,
  * Given a directfb window and a subsurface of that window
  * create a gdkwindow child wrapper
  */
-#if (DIRECTFB_MICRO_VERSION > 25)
+#if (DIRECTFB_MAJOR_VERSION >= 1)
 GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
                                 IDirectFBSurface *subsurface)
 {