diff --git a/configure b/configure
index e871b34181..cfcf0558cc 100755
--- a/configure
+++ b/configure
@@ -1659,7 +1659,7 @@ test -n "$target_alias" &&
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4
-wx_subrelease_number=0
+wx_subrelease_number=1
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -13364,9 +13364,10 @@ echo "${ECHO_T}$wx_cv_gccversion" >&6
         { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5
 echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
         wxUSE_OMF=yes
+	enable_omf=yes
       fi
       if test "$wxUSE_OMF" = "yes"; then
-        LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM"
       fi
         ;;
   *)
@@ -28207,23 +28208,24 @@ echo "$as_me: WARNING: system ODBC library not found, will use built-in instead"
                         wxUSE_ODBC=sys
         fi
     fi
-    if test "$wxUSE_ODBC" != "no" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
 
-        if test "$wxUSE_ODBC" = "builtin" ; then
-            cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_ODBC" = "builtin" ; then
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_BUILTIN_IODBC 1
 _ACEOF
 
-        fi
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-                WXODBCFLAG="-D_IODBC_"
     fi
 fi
 
+if test "$wxUSE_ODBC" != "no" ; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ODBC 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+
+        WXODBCFLAG="-D_IODBC_"
+fi
 
 
 if test "$wxUSE_DISPLAY" = "yes"; then
diff --git a/configure.in b/configure.in
index 95b8aa9a55..d069bcf376 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 wx_major_version_number=2
 wx_minor_version_number=5
 wx_release_number=4
-wx_subrelease_number=0
+wx_subrelease_number=1
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff --git a/include/wx/version.h b/include/wx/version.h
index 67e137eae4..32b40178cd 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5
 #define wxRELEASE_NUMBER     4
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  1
 #define wxVERSION_STRING   _T("wxWidgets 2.5.4")
 
 /*  nothing to update below this line when updating the version */
diff --git a/wxPython/config.py b/wxPython/config.py
index b9ebe12e74..6a93443a3b 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,8 +39,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 4
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "rc1"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 2f2e649d72..65a889e69d 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -2,7 +2,7 @@ Recent Changes for wxPython
 =====================================================================
 
 
-2.5.4.0
+2.5.4.1
 -------
 
 wx.Sizer Add, Insert, and Prepend functions now return a reference to the
@@ -226,6 +226,14 @@ wx.html.HtmlWindow now supports background images.
 Added wx.lib.gestures module from Daniel Pozmanter which supports
 using Mouse Gestures in an application.
 
+wxGTK2: ENTER and LEAVE mouse events are now sent for multi-line text
+controls.
+
+wxMSW:  "Alt" key (VK_MENU) now results in WXK_ALT keyboard event, not
+WXK_MENU
+
+
+