diff --git a/CHANGES.md b/CHANGES.md
index 5ac3db1eed..9ee38f01ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,10 @@ $ cd gsa && git log
  * Sort alerts at task details alphanumerically #1094
  * Add solution type to report details powerfilter #1091
  * Add feature: Scan Report Content Composer #1073 #1084 #1086 #1090
+ * Tags can now contain backslashes and percent signs in the value and
+   hyphens in the name to allow using the special "smb-alert:file_path"
+   task tag #1107 #1142 #1145
+
 
 ## gsa 8.0+beta2 (2018-12-04)
 
diff --git a/gsad/src/gsad.c b/gsad/src/gsad.c
index b2f40227b9..b47978ade6 100644
--- a/gsad/src/gsad.c
+++ b/gsad/src/gsad.c
@@ -677,7 +677,7 @@ init_validator ()
   gvm_validator_add (validator, "summary",    "^.{0,400}$");
   gvm_validator_add (validator, "tag_id",  "^[a-z0-9\\-]+$");
   gvm_validator_add (validator, "tag_name",  "^[\\:\\-_[:alnum:], \\./]{1,80}$");
-  gvm_validator_add (validator, "tag_value", "^[\\-_@[:alnum:], \\.\\\\]{0,200}$");
+  gvm_validator_add (validator, "tag_value", "^[\\-_@%[:alnum:], \\.\\\\]{0,200}$");
   gvm_validator_add (validator, "target_id",  "^[a-z0-9\\-]+$");
   gvm_validator_add (validator, "task_id",    "^[a-z0-9\\-]+$");
   gvm_validator_add (validator, "term",       "^.{0,1000}");