diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 1345135a8..b592bd506 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -11,6 +11,7 @@
  - fix: typo in Asset_ProjectManager i18n
  - fix: captcha image is blank (Martink Kamerbeek / Procolix)
  - fix: Pagination of search results does not work (Martin Kamerbeek / Procolix)
+ - fix: Workflow Commit with approval Error (Martin Kamerbeek / Procolix)
 
 6.99.3
  - Someone removed the status from the submission templates. That has been
diff --git a/docs/upgrades/upgrade_6.99.3-6.99.4.pl b/docs/upgrades/upgrade_6.99.3-6.99.4.pl
index 719f35183..cf05a9560 100644
--- a/docs/upgrades/upgrade_6.99.3-6.99.4.pl
+++ b/docs/upgrades/upgrade_6.99.3-6.99.4.pl
@@ -23,6 +23,7 @@ my $session = start(); # this line required
 # upgrade functions go here
 
 fixSurvey($session);
+fixEditWorkflow($session);
 
 finish($session); # this line required
 
@@ -45,6 +46,22 @@ sub fixSurvey{
 	}
 }
 
+sub fixEditWorkflow {
+	my @goodPlugins;
+	my $session = shift;
+	print "\tRemoving erroneous ExportVersionTagAsHtml workflow activity from config file.\n" unless ($quiet);
+
+	my $workflow = $session->config->get('workflowActivities');
+
+	foreach (@{$workflow->{'WebGUI::VersionTag'}}) {
+		push (@goodPlugins, $_) if ($_ ne 'WebGUI::Workflow::Activity::ExportVersionTagAsHtml');
+	}
+
+	$workflow->{'WebGUI::VersionTag'} = \@goodPlugins;
+	
+	$session->config->set('workflowActivities', $workflow);
+}
+
 ##-------------------------------------------------
 #sub exampleFunction {
 #	my $session = shift;