diff --git a/CHANGES.md b/CHANGES.md
index fabfe886f1..6089b5e75a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -116,6 +116,10 @@ after the corresponding tracker issues.
 - For developers: use RandomNumberGenerator class in VariableOrderFinder
   <http://issues.fast-downward.org/issue1032>
 
+- For users: the driver now finds domain files <taskfile>-domain.<ext>
+  for task files called <taskfile>.<ext>
+  <http://issues.fast-downward.org/issue1033>
+
 
 ## Fast Downward 20.06
 
diff --git a/driver/util.py b/driver/util.py
index d3bb263c1f..e31a735201 100644
--- a/driver/util.py
+++ b/driver/util.py
@@ -24,10 +24,11 @@ def find_domain_filename(task_filename):
     Find domain filename for the given task using automatic naming rules.
     """
     dirname, basename = os.path.split(task_filename)
+    basename_root, ext = os.path.splitext(basename)
 
     domain_basenames = [
         "domain.pddl",
-        basename[:3] + "-domain.pddl",
+        basename_root + "-domain" + ext,
         "domain_" + basename,
         "domain-" + basename,
     ]