diff --git a/Makefile.in b/Makefile.in
index 8b2301980..9022295c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.8.3
+ICINGA_VERSION=1.8.4
 
 CP=@CP@
 
diff --git a/configure b/configure
index 9834d8e2f..1ea231192 100755
--- a/configure
+++ b/configure
@@ -2456,9 +2456,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.8.3"
+PKG_VERSION="1.8.4"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-12-2012"
+PKG_REL_DATE="01-13-2013"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 0a8c29f1b..60f290119 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.8.3"
+PKG_VERSION="1.8.4"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-12-2012"
+PKG_REL_DATE="01-13-2013"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/html/main.html b/html/main.html
index aa5151709..40b47f350 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.8.3</div>
-<div class="releasedate">December 12, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.3</a></div>
+<div class="version">Version 1.8.4</div>
+<div class="releasedate">January 13, 2013</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.4</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index dc24b82ad..eafb383c6 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -20,7 +20,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.8.3
+Version: 1.8.4
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 48652f3a2..e8e82a86f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.8.3"
-#define PROGRAM_MODIFICATION_DATE "12-12-2012"
+#define PROGRAM_VERSION "1.8.4"
+#define PROGRAM_MODIFICATION_DATE "01-13-2013"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 5fc088b31..750613dee 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "12-12-2012"
-#define IDO_VERSION "1.8.3"
+#define IDO_DATE "01-13-2013"
+#define IDO_VERSION "1.8.4"
 
 #define IDO_SCHEMA_VERSION "1.8.0"
 
diff --git a/update-version b/update-version
index b8738eba0..513e705e1 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.8.3
+CURRENTVERSION=1.8.4
 
 # Last date
-LASTDATE=12-12-2012
+LASTDATE=01-13-2013
 
 if [ "x$1" = "x" ]
 then