diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py
index 189b0ae..29d689e 100644
--- a/ognibuild/debian/build.py
+++ b/ognibuild/debian/build.py
@@ -157,7 +157,7 @@ def add_dummy_changelog_entry(
         editor[0].distributions = suite
 
 
-def get_latest_changelog_version(local_tree, subpath=""):
+def get_latest_changelog_entry(local_tree, subpath=""):
     if control_files_in_root(local_tree, subpath):
         path = os.path.join(subpath, "changelog")
     else:
@@ -246,11 +246,11 @@ def build_once(
                     retcode, shlex.split(build_command),
                     [], sbuild_failure.description)
 
-    (cl_package, cl_version) = get_latest_changelog_version(local_tree, subpath)
+    cl_entry = get_latest_changelog_entry(local_tree, subpath)
     changes_names = []
-    for kind, entry in find_changes_files(output_directory, cl_package, cl_version):
+    for kind, entry in find_changes_files(output_directory, cl_entry.package, cl_entry.version):
         changes_names.append((entry.name))
-    return (changes_names, cl_version)
+    return (changes_names, cl_entry)
 
 
 def gbp_dch(path):
diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py
index 1ef9b12..ffb064d 100644
--- a/ognibuild/debian/fix_build.py
+++ b/ognibuild/debian/fix_build.py
@@ -681,7 +681,7 @@ def main(argv=None):
         apt = AptManager(session)
 
         try:
-            (changes_filenames, cl_version) = build_incrementally(
+            (changes_filenames, cl_entry) = build_incrementally(
                 tree,
                 apt,
                 args.suffix,
@@ -714,7 +714,7 @@ def main(argv=None):
 
         logging.info(
             'Built %s - changes file at %r.',
-            cl_version, changes_filenames)
+            cl_entry.version, changes_filenames)
 
 
 if __name__ == "__main__":