diff --git a/changelog b/changelog
index dbb3ce19cde..e9d5909d481 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-CVS HEAD:
+Version 0.9.7:
  * language and i18n:
    * updated manual: French, Italian
    * updated translations: Afrikaans, Basque, British English, Catalan, Czech,
diff --git a/config.h.dummy b/config.h.dummy
index e86725d585b..f44898fe32a 100644
--- a/config.h.dummy
+++ b/config.h.dummy
@@ -9,17 +9,17 @@
 #define PACKAGE_NAME "Battle for Wesnoth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 0.9.6+cvs"
+#define PACKAGE_STRING "Battle for Wesnoth 0.9.7"
 
 /* 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.6+cvs"
+#define PACKAGE_VERSION "0.9.7"
 
 /* Version number of package */
-#define VERSION "0.9.6+cvs"
+#define VERSION "0.9.7"
 
 /* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
+#define WESNOTH_DEFAULT_SERVER "server.wesnoth.org"
 
diff --git a/configure.ac b/configure.ac
index 4b30c85992f..96595d7f042 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@
 
 AC_PREREQ([2.57])
 
-define([WESNOTH_VERSION],[0.9.6+cvs])
+define([WESNOTH_VERSION],[0.9.7])
 
-dnl define([DEFAULT_SERVER],[server.wesnoth.org])
-define([DEFAULT_SERVER],[devsrv.wesnoth.org:14999])
+define([DEFAULT_SERVER],[server.wesnoth.org])
+dnl define([DEFAULT_SERVER],[devsrv.wesnoth.org:14999])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [davidnwhite@verizon.net], [wesnoth])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server for this version])
diff --git a/src/wesconfig.h b/src/wesconfig.h
index c883b1798f3..da47a5db410 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.6+cvs"
-# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
+# define VERSION "0.9.7"
+# define WESNOTH_DEFAULT_SERVER "server.wesnoth.org"
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"