diff --git a/ChangeLog b/ChangeLog
index 18582aeb29..aead95ce5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-26  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpdisplayshell.c (gimp_display_shell_new): applied
+	patch from Robert Ögren that works around problem creating guides
+	with a tablet on Windows by enabling extension events for the
+	rulers.  Fixes the first problem described in bug #168516.
+
+	* configure.in: bumped version to 2.3.5.
+
 2005-09-26  Sven Neumann  <sven@gimp.org>
 
 	* Made 2.3.4 development release.
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index dbc6f200c8..a2e0feadbe 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -846,6 +846,11 @@ gimp_display_shell_new (GimpDisplay     *gdisp,
 
   gimp_help_set_help_data (shell->vrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER);
 
+  /* Workaround for GTK+ Wintab bug on Windows when creating guides by
+   * dragging from the rulers. See bug #168516. */
+  gtk_widget_set_extension_events (shell->hrule, GDK_EXTENSION_EVENTS_ALL);
+  gtk_widget_set_extension_events (shell->vrule, GDK_EXTENSION_EVENTS_ALL);
+  
   /*  the canvas  */
   gtk_widget_set_size_request (shell->canvas, n_width, n_height);
   gtk_widget_set_events (shell->canvas, GIMP_DISPLAY_SHELL_CANVAS_EVENT_MASK);
diff --git a/configure.in b/configure.in
index ab2ec21e38..fba55950fd 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_PREREQ(2.54)
 
 m4_define([gimp_major_version], [2])
 m4_define([gimp_minor_version], [3])
-m4_define([gimp_micro_version], [4])
+m4_define([gimp_micro_version], [5])
 m4_define([gimp_real_version],
           [gimp_major_version.gimp_minor_version.gimp_micro_version])
 m4_define([gimp_version], [gimp_real_version])