diff --git a/data/tools/wesnoth/campaignserver_client.py b/data/tools/wesnoth/campaignserver_client.py
index da93ea3af39..a301ff03855 100755
--- a/data/tools/wesnoth/campaignserver_client.py
+++ b/data/tools/wesnoth/campaignserver_client.py
@@ -458,5 +458,6 @@ class CampaignClient:
             if verbose:
                 sys.stderr.write(i * " " + name + "\n")
             self.unpackdir(dir, os.path.join(path, name), i + 2, verbose)
+        return name
 
 # vim: tabstop=4: shiftwidth=4: expandtab: softtabstop=4: autoindent:
diff --git a/data/tools/wesnoth_addon_manager b/data/tools/wesnoth_addon_manager
index d5ebf0834a4..727de21899a 100755
--- a/data/tools/wesnoth_addon_manager
+++ b/data/tools/wesnoth_addon_manager
@@ -120,7 +120,7 @@ if __name__ == "__main__":
         else:
             decoded = cs.decode(mythread.data)
             print "Unpacking %s..." % name
-            cs.unpackdir(decoded, cdir, verbose = options.verbose)
+            name = cs.unpackdir(decoded, cdir, verbose = options.verbose)
             dirname = os.path.join(cdir, name)
             info = os.path.join(dirname, "_info.cfg")
             try: