diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5ddc343..d403647b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,9 @@ cmake_minimum_required( VERSION 2.6 )
 set( PACKAGE_BUGREPORT      "ahuggel@gmx.net" )
 set( PACKAGE                "exiv2" )
 set( PACKAGE_NAME           "exiv2" )
-set( PACKAGE_STRING         "exiv2 0.18.2" )
+set( PACKAGE_STRING         "exiv2 0.18.99" )
 set( PACKAGE_TARNAME        "exiv2" )
-set( PACKAGE_VERSION        "0.18.2" )
+set( PACKAGE_VERSION        "0.18.99" )
 set( GENERIC_LIB_VERSION    "5.3.1" )
 set( GENERIC_LIB_SOVERSION  "5" )
 
diff --git a/config/configure.ac b/config/configure.ac
index a20573f8..9ecab6b1 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(exiv2, 0.18.2, ahuggel@gmx.net)
+AC_INIT(exiv2, 0.18.99, ahuggel@gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 EXIV2_LTVERSION=8:1:3
 PACKAGE=$PACKAGE_NAME
diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index 3b2cfb49..717acb89 100644
--- a/msvc/include/exv_msvc.h
+++ b/msvc/include/exv_msvc.h
@@ -23,13 +23,13 @@
 #define EXV_PACKAGE_NAME "exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.18.2"
+#define EXV_PACKAGE_STRING "exiv2 0.18.99"
 
 /* Define to the one symbol short name of this package. */
 #define EXV_PACKAGE_TARNAME "exiv2"
 
 /* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.18.2"
+#define EXV_PACKAGE_VERSION "0.18.99"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 typedef int pid_t;
diff --git a/src/version.hpp b/src/version.hpp
index f7c11b6f..6a10dd7a 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -43,7 +43,7 @@
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
-#define EXIV2_PATCH_VERSION  (2)
+#define EXIV2_PATCH_VERSION  (99)
 /*!
   @brief Make an integer version number for comparison from a major, minor and
          a patch version number.
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 2aeee337..e18e6135 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
 
 Exiv2 version ------------------------------------------------------------
 /usr/local/bin/exiv2
-exiv2 0.18.2
+exiv2 0.18.99
 Copyright (C) 2004-2009 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or