diff --git a/trunk/config/config.php b/trunk/config/config.php
index c5ec5d65d9..6c55c56af7 100644
--- a/trunk/config/config.php
+++ b/trunk/config/config.php
@@ -22,7 +22,7 @@
  * @link        http://www.zentao.cn
  */
 /* 基本参数设定。*/
-$config->version     = '1.0 beta';                      // 版本号，切勿修改。
+$config->version     = '1.0beta';                      // 版本号，切勿修改。
 $config->helpRoot    = 'http://doc.zentao.cn/help/';    // 在线帮助的URI地址。
 $config->encoding    = 'UTF-8';                         // 网站的编码。
 $config->cookiePath  = '/';                             // cookie的有效路径。
diff --git a/trunk/module/install/control.php b/trunk/module/install/control.php
index 953750ffca..b1c8f10694 100644
--- a/trunk/module/install/control.php
+++ b/trunk/module/install/control.php
@@ -23,7 +23,7 @@
  */
 class install extends control
 {
-    const VERSION = '0.6 beta';
+    const VERSION = '1.0beta';
 
     /* 鏋勯�犲嚱鏁帮紝妫�鏌ユ槸鍚︽槸閫氳繃瀹夎鍏ュ彛璋冪敤銆�*/
     public function __construct()
diff --git a/trunk/module/upgrade/lang/zh-cn.php b/trunk/module/upgrade/lang/zh-cn.php
index 1a28897019..2831784692 100644
--- a/trunk/module/upgrade/lang/zh-cn.php
+++ b/trunk/module/upgrade/lang/zh-cn.php
@@ -46,3 +46,4 @@ $lang->upgrade->sureExecute   = '纭鎵ц';
 $lang->upgrade->fromVersions['0_3'] = '0.3 BETA';
 $lang->upgrade->fromVersions['0_4'] = '0.4 BETA';
 $lang->upgrade->fromVersions['0_5'] = '0.5 BETA';
+$lang->upgrade->fromVersions['0_6'] = '0.6 BETA';
diff --git a/trunk/module/upgrade/model.php b/trunk/module/upgrade/model.php
index 9df17c6016..3aa6544f04 100644
--- a/trunk/module/upgrade/model.php
+++ b/trunk/module/upgrade/model.php
@@ -35,15 +35,22 @@ class upgradeModel extends model
             $this->upgradeFrom0_3To0_4();
             $this->upgradeFrom0_4To0_5();
             $this->upgradeFrom0_5To0_6();
+            $this->upgradeFrom0_6To1_0_B();
         }
         elseif($fromVersion == '0_4')
         {
             $this->upgradeFrom0_4To0_5();
             $this->upgradeFrom0_5To0_6();
+            $this->upgradeFrom0_6To1_0_B();
         }
         elseif($fromVersion == '0_5')
         {
             $this->upgradeFrom0_5To0_6();
+            $this->upgradeFrom0_6To1_0_B();
+        }
+        elseif($fromVersion == '0_6')
+        {
+            $this->upgradeFrom0_6To1_0_B();
         }
     }
 
@@ -56,15 +63,22 @@ class upgradeModel extends model
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.3'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.5'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('0.6'));
         }
         elseif($fromVersion == '0_4')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.4'));
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.5'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('0.6'));
         }
         elseif($fromVersion == '0_5')
         {
             $confirmContent .= file_get_contents($this->getUpgradeFile('0.5'));
+            $confirmContent .= file_get_contents($this->getUpgradeFile('0.6'));
+        }
+        elseif($fromVersion == '0_6')
+        {
+            $confirmContent .= file_get_contents($this->getUpgradeFile('0.6'));
         }
 
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -92,6 +106,13 @@ class upgradeModel extends model
         if(!$this->isError()) $this->updateVersion('0.6 beta');
     }
 
+    /* 浠�0.6鐗堟湰鍗囩骇鍒�1.0 beta鐗堟湰銆�*/
+    private function upgradeFrom0_6To1_0_B()
+    {
+        $this->execSQL($this->getUpgradeFile('0.6'));
+        if(!$this->isError()) $this->updateVersion('1.0beta');
+    }
+
     /* 鏇存柊PMS鐨勭増鏈缃��*/
     public function updateVersion($version)
     {