diff --git a/ChangeLog b/ChangeLog
index 25a746f..ad8d34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-21  Lucas Rocha  <lucasr@gnome.org>
+
+	* NEWS: release 2.23.1
+
 2008-04-21  Lucas Rocha  <lucasr@gnome.org>
 
 	Add support for file filter in file selection dialog through the new
diff --git a/NEWS b/NEWS
index 5689137..27c7dc4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Zenity 2.23.1
+" 7 years "
+   * Add support for file filter in file selection dialog through the new
+     --file-filter command line option (Ricardo Cruz) [#409843]
+   * Misc code improvements on list dialog (kraai@ftbfs.org) [#526627, #527258]
+   * Allow question dialogs to use custom button label text (Cosimo Cecchi,
+     Thomas Thurman) [#335763].
+   * Added description for --timeout option (Luca Ferretti) [#516876]
+   * Set value range before setting value in order to correctly set initial 
+     state [#521574]
+   * Added comment on a string in order clarify its meaning for 
+     translators [#520847]
+   * New and updated translations
+	- Yannig Marchegay [oc]
+	- Marcel Telka [sk]
+	- Jorge Gonzalez [es]
+	- Danilo Nylander [sv]
+	- Yair Hershkovitz [he]
+	- Priit Laes [et]
+	- Kjartan Maraas [nb]
+
 Zenity 2.22.0
 " My favourite things "
    * New and updated documentation translations
diff --git a/configure.in b/configure.in
index eca3196..4b2c10f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([Zenity],[2.22.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
+AC_INIT([Zenity],[2.23.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
 
 AC_PREREQ([2.59])
 
diff --git a/help/ChangeLog b/help/ChangeLog
index 03f9950..1669bc5 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-21  Lucas Rocha  <lucasr@gnome.org>
+
+	* 2.23.1 version marker.
+
 2008-03-10  Lucas Rocha  <lucasr@gnome.org>
 
 	* 2.22.0 version marker.
diff --git a/po/ChangeLog b/po/ChangeLog
index df85fa1..ea0ec55 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-21  Lucas Rocha  <lucasr@gnome.org>
+
+	* 2.23.1 version marker.
+
 2008-04-21  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.
diff --git a/src/util.c b/src/util.c
index 267332c..cf34579 100644
--- a/src/util.c
+++ b/src/util.c
@@ -350,7 +350,6 @@ transient_get_xterm_toplevel (void)
 static void
 zenity_util_make_transient (GdkWindow *window)
 {
-#if 0
   Window xterm = transient_get_xterm_toplevel ();
   if (xterm != None) {
     GdkWindow *gdkxterm = gdk_window_foreign_new (xterm);
@@ -359,7 +358,6 @@ zenity_util_make_transient (GdkWindow *window)
       g_object_unref (G_OBJECT (gdkxterm));
     }
   }
-#endif
 }
 
 #endif /* GDK_WINDOWING_X11 */
diff --git a/src/zenity.glade b/src/zenity.glade
index ffda0e8..7095b97 100644
--- a/src/zenity.glade
+++ b/src/zenity.glade
@@ -16,7 +16,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 19:08:11 GMT"/>
@@ -177,7 +177,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 23:24:20 GMT"/>
@@ -288,7 +288,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="show_fileops">True</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 11:48:27 GMT"/>
@@ -328,7 +328,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:03:54 GMT"/>
@@ -425,7 +425,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:15:37 GMT"/>
@@ -550,7 +550,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:34:38 GMT"/>
@@ -653,7 +653,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 14:46:29 GMT"/>
@@ -776,7 +776,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
@@ -902,7 +902,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 22:19:04 GMT"/>
@@ -1038,7 +1038,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
@@ -1151,7 +1151,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Tue, 13 Dec 2005 04:03:21 GMT"/>