diff --git a/docs/upgrades/upgrade_7.0.9-7.1.0.pl b/docs/upgrades/upgrade_7.0.9-7.1.0.pl
index 4144e31a2..503bfa318 100755
--- a/docs/upgrades/upgrade_7.0.9-7.1.0.pl
+++ b/docs/upgrades/upgrade_7.0.9-7.1.0.pl
@@ -23,6 +23,7 @@ recalculateProjectCompletion($session);
 updateSqlReportTable($session);
 updateProductsTable($session);
 makeLdapRecursiveFiltersText($session);
+addWikiAssets($session);
 addImageStuffToCs($session);
 
 finish($session); # this line required
@@ -69,7 +70,7 @@ sub makeLdapRecursiveFiltersText {
 	my $session = shift;
 	print "\tMaking LDAP recursive filters text fields.\n" unless $quiet;
 	$session->db->write($_) for(<<'EOT',
-    ALTER TABLE LDAPLink
+    ALTER TABLE ldapLink
   CHANGE COLUMN ldapGlobalRecursiveFilter ldapGlobalRecursiveFilter mediumtext NULL DEFAULT NULL
 EOT
 				    <<'EOT',
@@ -79,6 +80,74 @@ EOT
 				   )
 }
 
+sub addWikiAssets {
+	my $session = shift;
+	print "\tAdding wiki assets.\n" unless $quiet;
+
+	$session->db->write($_) for(<<'EOT',
+  CREATE TABLE `WikiMaster` (
+    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `revisionDate` bigint(20) NOT NULL,
+    `groupToEditPages` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `groupToAdminister` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `richEditor` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                 default 'PBrichedit000000000002',
+    `defaultPage` varchar(22) character set utf8 collate utf8_bin NULL,
+    `masterTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                       default 'WikiMasterTmpl00000001',
+    `pageTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                     default 'WikiPageTmpl0000000001',
+    `pageEditTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                         default 'WikiPageEditTmpl000001',
+    `recentChangesTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                              default 'WikiRCTmpl000000000001',
+    `pageHistoryTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                            default 'WikiPHTmpl000000000001',
+    `pageListTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
+                         default 'WikiPLTmpl000000000001',
+    PRIMARY KEY (`assetId`, `revisionDate`)
+  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+EOT
+				    <<'EOT',
+  CREATE TABLE `WikiPage` (
+    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `revisionDate` bigint(20) NOT NULL,
+    `content` mediumtext,
+    `storageId` varchar(22) character set utf8 collate utf8_bin NULL,
+    `views` bigint(20) NOT NULL default 0,
+    PRIMARY KEY (`assetId`, `revisionDate`)
+  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+EOT
+				    <<'EOT',
+  CREATE TABLE `WikiMaster_titleIndex` (
+    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `pageId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `title` varchar(255) NOT NULL,
+    PRIMARY KEY (`assetId`, `pageId`)
+  );
+EOT
+				    # Don't want protection to be versioned, so put it in a
+				    # separate table.
+				    <<'EOT',
+  CREATE TABLE `WikiPage_protected` (
+    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    PRIMARY KEY (`assetId`)
+  );
+EOT
+				    <<'EOT',
+  CREATE TABLE `WikiPage_extraHistory` (
+    `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
+    `dateStamp` bigint(20) NOT NULL,
+    `actionTaken` varchar(255) NOT NULL default ''
+  );
+EOT
+				   );
+
+	my $config = $session->config;
+	$config->addToArray('assets', 'WebGUI::Asset::Wobject::WikiMaster');
+}
+
 # ---- DO NOT EDIT BELOW THIS LINE ----
 
 #-------------------------------------------------