diff --git a/wiki/db/migrate/026_create_wikis.rb b/wiki/db/migrate/026_create_wikis.rb
index 341f8fbfa..ed6784296 100644
--- a/wiki/db/migrate/026_create_wikis.rb
+++ b/wiki/db/migrate/026_create_wikis.rb
@@ -1,7 +1,11 @@
 class CreateWikis < ActiveRecord::Migration
   def self.up
     create_table :wikis do |t|
-    end
+      t.column :project_id, :integer, :null => false
+      t.column :start_page, :string,  :limit => 255, :null => false
+      t.column :status, :integer, :default => 1, :null => false
+    end    
+    add_index :wikis, :project_id, :name => :wikis_project_id
   end
 
   def self.down
diff --git a/wiki/db/migrate/027_create_wiki_pages.rb b/wiki/db/migrate/027_create_wiki_pages.rb
index 1f89b4262..535cbfb0a 100644
--- a/wiki/db/migrate/027_create_wiki_pages.rb
+++ b/wiki/db/migrate/027_create_wiki_pages.rb
@@ -1,7 +1,11 @@
 class CreateWikiPages < ActiveRecord::Migration
   def self.up
     create_table :wiki_pages do |t|
+      t.column :wiki_id, :integer, :null => false
+      t.column :title, :string, :limit => 255, :null => false
+      t.column :created_on, :datetime, :null => false    
     end
+    add_index :wiki_pages, [:wiki_id, :title], :name => :wiki_pages_wiki_id_title
   end
 
   def self.down
diff --git a/wiki/db/migrate/028_create_wiki_contents.rb b/wiki/db/migrate/028_create_wiki_contents.rb
index cf8737eee..5c25c5e1a 100644
--- a/wiki/db/migrate/028_create_wiki_contents.rb
+++ b/wiki/db/migrate/028_create_wiki_contents.rb
@@ -1,10 +1,30 @@
 class CreateWikiContents < ActiveRecord::Migration
   def self.up
     create_table :wiki_contents do |t|
+      t.column :page_id, :integer, :null => false
+      t.column :author_id, :integer
+      t.column :text, :text, :default => "", :null => false
+      t.column :comment, :string, :limit => 255, :default => ""
+      t.column :updated_on, :datetime, :null => false
+      t.column :version, :integer, :null => false
     end
+    add_index :wiki_contents, :page_id, :name => :wiki_contents_page_id
+    
+    create_table :wiki_content_versions do |t|
+      t.column :wiki_content_id, :integer, :null => false
+      t.column :page_id, :integer, :null => false
+      t.column :author_id, :integer
+      t.column :data, :binary
+      t.column :compression, :string, :limit => 6, :default => ""
+      t.column :comment, :string, :limit => 255, :default => ""
+      t.column :updated_on, :datetime, :null => false
+      t.column :version, :integer, :null => false
+    end
+    add_index :wiki_content_versions, :wiki_content_id, :name => :wiki_content_versions_wcid
   end
 
   def self.down
     drop_table :wiki_contents
+    drop_table :wiki_content_versions
   end
 end