diff --git a/setup/inc/sql/v1.6rc5-upgrade.sql b/include/upgrader/patches/98ae1ed2-e342f869.patch.sql
similarity index 97%
rename from setup/inc/sql/v1.6rc5-upgrade.sql
rename to include/upgrader/patches/98ae1ed2-e342f869.patch.sql
index 9f44710fe3bb1c4523433619c59e31e01bd94f73..6d57260307e76532614766c6a917f67c5dfe60a1 100644
--- a/setup/inc/sql/v1.6rc5-upgrade.sql
+++ b/include/upgrader/patches/98ae1ed2-e342f869.patch.sql
@@ -1,3 +1,11 @@
+/**
+ * @version v1.6 RC5
+ * @signature e342f869c7a537ab3ee937fb6e21cdd4
+ *
+ *  Upgrade from 1.6 RC1-4 to 1.6 RC5
+ *  
+ */
+
 ALTER TABLE `%TABLE_PREFIX%email` 
 ADD `userid` VARCHAR( 125 ) NOT NULL AFTER `name` ,
 ADD `userpass` VARCHAR( 125 ) NOT NULL AFTER `userid`,
@@ -126,3 +134,5 @@ CREATE TABLE `%TABLE_PREFIX%syslog` (
   KEY `log_type` (`log_type`)
 ) ENGINE=MyISAM;
 
+UPDATE `%TABLE_PREFIX%config`
+    SET `ostversion`='1.6 RC5';
diff --git a/setup/inc/sql/v1.6st-upgrade.sql b/include/upgrader/patches/e342f869-c00511c7.patch.sql
similarity index 90%
rename from setup/inc/sql/v1.6st-upgrade.sql
rename to include/upgrader/patches/e342f869-c00511c7.patch.sql
index 571620fb1beddc9137ea77c133b7bc47cc7a6960..095e3100ac2083139edaabaa6f31a03bd5391bcf 100644
--- a/setup/inc/sql/v1.6st-upgrade.sql
+++ b/include/upgrader/patches/e342f869-c00511c7.patch.sql
@@ -1,3 +1,11 @@
+/**
+ * @version v1.6 ST
+ * @signature c00511c7c1db65c0cfad04b4842afc57
+ *
+ *  Upgrade from 1.6 RC5 to 1.6 ST
+ *  
+ */
+
 ALTER TABLE `%TABLE_PREFIX%ticket` ADD `topic_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `priority_id`;
 
 ALTER TABLE `%TABLE_PREFIX%ticket` ADD INDEX ( `topic_id` );
@@ -26,3 +34,6 @@ ADD `ticket_notice_body` TEXT NOT NULL AFTER `ticket_notice_subj`;
 
 INSERT INTO `%TABLE_PREFIX%kb_premade` (`premade_id`, `dept_id`, `isenabled`, `title`, `answer`, `created`, `updated`) VALUES
     ('', 0, 1, 'Sample (with variables)', '\r\n%name,\r\n\r\nYour ticket #%ticket created on %createdate is in %dept department.\r\n\r\n', NOW(), NOW());
+
+UPDATE `%TABLE_PREFIX%config`
+    SET `ostversion`='1.6 ST';