diff --git a/base/icinga.c b/base/icinga.c
index 43c807ed0..4899e56df 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,12 +3,12 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga (Nagios)
- * Version: 0.8 (Nagios 3.1.0)
+ * Version: 0.8.1 (Nagios 3.1.0-cvs)
  * License: GPL
  * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
  *
  * First Written:   01-28-1999 (start of development)
- * Last Modified:   05-20-2009
+ * Last Modified:   06-17-2009
  *
  * Description:
  *
diff --git a/base/icingastats.c b/base/icingastats.c
index 24a842472..bf2eb269a 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,11 +3,11 @@
  * ICINGASTATS.C - Displays Nagios Statistics
  *
  * Program: Icingastats (based on Nagiostats)
- * Version: 0.8
+ * Version: 0.8.1
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad (egalstad@nagios.org)
  *
- * Last Modified: 05-11-2009
+ * Last Modified:   06-17-2009
  *
  * License:
  *
diff --git a/configure b/configure
index 947d764c1..ad8ed6265 100755
--- a/configure
+++ b/configure
@@ -1763,9 +1763,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h includ
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="0.8"
+PKG_VERSION="0.8.1"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-20-2009"
+PKG_REL_DATE="06-17-2009"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -9403,4 +9403,6 @@ echo ""
 echo "Review the options above for accuracy.  If they look okay,"
 echo "type 'make all' to compile the main program and CGIs."
 echo ""
-
+echo ""
+echo "!!! Please take care about the upgrade documentation !!!"
+echo ""
diff --git a/configure.in b/configure.in
index 9fa03c72e..837fedf99 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="0.8"
+PKG_VERSION="0.8.1"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-20-2009"
+PKG_REL_DATE="06-17-2009"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
@@ -903,4 +903,6 @@ echo ""
 echo "Review the options above for accuracy.  If they look okay,"
 echo "type 'make all' to compile the main program and CGIs."
 echo ""
-
+echo ""
+echo "!!! Please take care about the upgrade documentation !!!"
+echo ""
diff --git a/html/main.html b/html/main.html
index b632da5eb..eccb9719b 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,8 +18,8 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 0.8</div>
-<div class="releasedate">Mai 20, 2009</div>
+<div class="version">Version 0.8.1</div>
+<div class="releasedate">June 17, 2009</div>
 <div class="whatsnew"><a href="docs/wb_whatsnew.html">Read what's new in Icinga 0.8</a></div>
 </div>
 
diff --git a/icinga.spec b/icinga.spec
index 295230908..f2fe20c4f 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -1,5 +1,5 @@
 %define name icinga
-%define version 0.8
+%define version 0.8.1
 %define release 1
 %define nsusr icinga
 %define nsgrp icinga
diff --git a/include/common.h b/include/common.h
index 7e0146923..e0741ea92 100644
--- a/include/common.h
+++ b/include/common.h
@@ -25,8 +25,8 @@
 
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
-#define PROGRAM_VERSION "0.8"
-#define PROGRAM_MODIFICATION_DATE "05-20-2009"
+#define PROGRAM_VERSION "0.8.1"
+#define PROGRAM_MODIFICATION_DATE "06-17-2009"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/update-version b/update-version
index 1347a040e..d990adbd3 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=0.8
+CURRENTVERSION=0.8.1
 
 # Last date
-LASTDATE=05-20-2009
+LASTDATE=06-17-2009
 
 if [ "x$1" = "x" ]
 then