diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 14a426faf5..6804217143 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,5 +1,5 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.1
+SET WXW_VER=2.8.4
 if (%WXW_VER%)==() SET WXW_VER=CVS
 
 echo docs building for %WXW_VER%
diff --git a/configure.in b/configure.in
index aaaeebc258..89416f77ad 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.8.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.4], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -34,7 +34,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=3
+wx_release_number=4
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 0c7eab44ac..6389238e68 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.2
+BUILD_VERSION=2.8.4
 BUILD_TAG=HEAD
 
 
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 9af5142e82..ba67e168a6 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWidgets 2.8.3: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.8.4: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
diff --git a/include/wx/version.h b/include/wx/version.h
index 0c38297673..91f6b1d905 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -28,9 +28,9 @@
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      8
-#define wxRELEASE_NUMBER     3
+#define wxRELEASE_NUMBER     4
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   _T("wxWidgets 2.8.3")
+#define wxVERSION_STRING   _T("wxWidgets 2.8.4")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/wxBase.spec b/wxBase.spec
index 9b5b8f024c..99109fb6e0 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.3
+%define ver  2.8.4
 %define ver2 2.8
 %define rel  3
 
diff --git a/wxGTK.spec b/wxGTK.spec
index b28f108ba9..4205da71e5 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define _prefix /usr
-%define ver  2.8.3
+%define ver  2.8.4
 %define ver2 2.8
 %define rel  3
 
diff --git a/wxMGL.spec b/wxMGL.spec
index d6a35005df..d15222d817 100644
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.3
+%define ver  2.8.4
 %define ver2 2.8
 %define rel  3
 
diff --git a/wxMotif.spec b/wxMotif.spec
index 2754e74a12..64d7c65cc0 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.3
+%define ver  2.8.4
 %define ver2 2.8
 %define rel  3
 
diff --git a/wxX11.spec b/wxX11.spec
index 3afbe892d7..a246c0347b 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.3
+%define ver  2.8.4
 %define ver2 2.8
 %define rel  3