diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472ed278b..d2b702b2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "6-dev")
+SET(VERSION_PATCH "6-rc1")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
diff --git a/ChangeLog b/ChangeLog
index 9e203ccf2..692aae431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-10-02
+v0.3.6-rc1, 2011-10-02
 
 
 Version 0.3.6 (under dev!)
diff --git a/NEWS b/NEWS
index 3f95bd753..531c0e7ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-09-29
+v0.3.6-rc1, 2011-10-02
 
 
 Version 0.3.6 (under dev!)
diff --git a/configure.in b/configure.in
index c1e883df0..135e5e44f 100644
--- a/configure.in
+++ b/configure.in
@@ -24,10 +24,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.6-dev, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.6-rc1, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.6-dev])
+AM_INIT_AUTOMAKE([weechat], [0.3.6-rc1])
 LICENSE="GPL3"
 
 # Checks for programs