diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a5c401809..d4860601a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,6 +15,7 @@
  - fixed #11455: Wrong use of Extras macro?
  - fixed #11715: "Empty" user profile fields: not in userProfileData / cannot delete
  - fixed #11718: Matrix does not URI encode search parameters
+ - fixed #11721: spamStopWords not in WebGUI.conf.original
 
 7.9.8
  - fixed #11651: First Day of Week is a string...
diff --git a/docs/upgrades/upgrade_7.9.8-7.9.9.pl b/docs/upgrades/upgrade_7.9.8-7.9.9.pl
index 4a8d1e8b3..8ef11ccac 100644
--- a/docs/upgrades/upgrade_7.9.8-7.9.9.pl
+++ b/docs/upgrades/upgrade_7.9.8-7.9.9.pl
@@ -35,6 +35,7 @@ my $session = start(); # this line required
 addIndexToUserSessionLog($session);
 addHeightToCarousel($session);
 synchronizeUserProfileTables($session);
+addSpamStopWordsToConfig($session);
 
 finish($session); # this line required
 
@@ -48,6 +49,16 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub addSpamStopWordsToConfig {
+    my $session = shift;
+    print "\tAdd SPAM controls to config file... " unless $quiet;
+    # and here's our code
+    $session->config->set('spamStopWords', []);
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 sub addIndexToUserSessionLog {
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 513e57b82..fa1ba2b4f 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -1076,6 +1076,11 @@
 # show hidden pages
    "siteIndex" : {
       "showHiddenPages" : 0
-   }
+   },
+
+# An array of SPAM words.  Used in the Post and WikiPage to block spam by sending the asset directly
+# to the trash.
+   "spamStopWords" : [
+   ]
 
 }