diff --git a/guessit/config/options.json b/guessit/config/options.json
index cb5f44a..61c460e 100644
--- a/guessit/config/options.json
+++ b/guessit/config/options.json
@@ -242,12 +242,10 @@
         "Extended": {"string": ["extended"], "regex": ["extended-?cut", "extended-?version"], "tags": ["has-neighbor", "release-group-prefix"]},
         "Alternative Cut": {"regex": ["alternat(e|ive)(?:-?Cut)?"], "tags": ["has-neighbor", "release-group-prefix"]},
         "Remastered": [
-          {"string": "Remastered", "tags": ["has-neighbor", "release-group-prefix"]},
-          {"regex": "4k-remaster(?:ed)?", "tags": ["release-group-prefix"]}
+          {"regex": "(?:4k.)?remaster(?:ed)?", "tags": ["release-group-prefix"]}
         ],
         "Restored": [
-          {"string": "Restored", "tags": ["has-neighbor", "release-group-prefix"]},
-          {"regex": "4k-restore(?:d)?", "tags": ["release-group-prefix"]}
+          {"regex": "(?:4k.)?restore(?:d)?", "tags": ["release-group-prefix"]}
         ],
         "Uncensored": {"string": "Uncensored", "tags": ["has-neighbor", "release-group-prefix"]},
         "Uncut": {"string": "Uncut", "tags": ["has-neighbor", "release-group-prefix"]},
diff --git a/guessit/test/rules/edition.yml b/guessit/test/rules/edition.yml
index d1d5277..c34d606 100644
--- a/guessit/test/rules/edition.yml
+++ b/guessit/test/rules/edition.yml
@@ -31,6 +31,22 @@
 ? Super Movie Alternative Cut XViD
 : edition: Alternative Cut
 
+? Remaster
+? Remastered
+? 4k-Remaster
+? 4k-Remastered
+? 4k Remaster
+? 4k Remastered
+: edition: Remastered
+
+? Restore
+? Restored
+? 4k-Restore
+? 4k-Restored
+? 4k Restore
+? 4k Restored
+: edition: Restored
+
 ? ddc
 : edition: Director's Definitive Cut