diff --git a/changelog b/changelog
index af4b7094c46..0c0c49e73f6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,5 @@
+CVS HEAD:
+
 Version 0.9.1:
  * user interface improvements:
    * added a shortcut for making screenshots
diff --git a/config.h.dummy b/config.h.dummy
index f0e97a0dd30..f5db1ae48dc 100644
--- a/config.h.dummy
+++ b/config.h.dummy
@@ -3,23 +3,23 @@
 #define PACKAGE "wesnoth"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "davidnwhite@optusnet.com.au"
+#define PACKAGE_BUGREPORT "davidnwhite@comcast.net"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "Battle for Wesnoth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 0.9.1"
+#define PACKAGE_STRING "Battle for Wesnoth 0.9.1+cvs"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "wesnoth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9.1"
+#define PACKAGE_VERSION "0.9.1+cvs"
 
 /* Version number of package */
-#define VERSION "0.9.1"
+#define VERSION "0.9.1+cvs"
 
 /* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "server.wesnoth.org"
+#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
 
diff --git a/configure.ac b/configure.ac
index 9ced2910e60..bba9c6ac722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,12 +6,12 @@
 
 AC_PREREQ([2.57])
 
-define([WESNOTH_VERSION],[0.9.1])
+define([WESNOTH_VERSION],[0.9.1+cvs])
 
-define([DEFAULT_SERVER],[server.wesnoth.org])
-dnl define([DEFAULT_SERVER],[devsrv.wesnoth.org])
+dnl define([DEFAULT_SERVER],[server.wesnoth.org])
+define([DEFAULT_SERVER],[devsrv.wesnoth.org])
 
-AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [davidnwhite@optusnet.com.au], [wesnoth])
+AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [davidnwhite@comcast.net], [wesnoth])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server for this version])
 
 dnl
diff --git a/src/wesconfig.h b/src/wesconfig.h
index ca6f0ced8df..17fbf5fd0fe 100644
--- a/src/wesconfig.h
+++ b/src/wesconfig.h
@@ -4,8 +4,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
-# define VERSION "0.9.1"
-# define WESNOTH_DEFAULT_SERVER "server.wesnoth.org"
+# define VERSION "0.9.1+cvs"
+# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"