diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index 73228099f7..c79ccfeedb 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -667,6 +667,7 @@ class CommandAddonManager:
             if size > 1000:  # Make sure there is actually data in there
                 cache_is_bad = False
         if self.update_cache or cache_is_bad:
+            self.update_cache = True
             self.macro_worker = FillMacroListWorker(self.get_cache_file_name("Macros"))
             self.macro_worker.status_message_signal.connect(self.show_information)
             self.macro_worker.progress_made.connect(self.update_progress_bar)
@@ -856,6 +857,7 @@ class CommandAddonManager:
             addon_repo.icon = self.get_icon(addon_repo)
         for repo in self.item_model.repos:
             if repo.name == addon_repo.name:
+                #self.item_model.reload_item(repo) # If we want to have later additions supercede earlier
                 return
         self.item_model.append_item(addon_repo)
 
diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py
index 55813376f5..9b8c14bba1 100644
--- a/src/Mod/AddonManager/addonmanager_workers.py
+++ b/src/Mod/AddonManager/addonmanager_workers.py
@@ -25,6 +25,7 @@
 import os
 import re
 import shutil
+import stat
 import json
 import tempfile
 import hashlib
@@ -639,14 +640,37 @@ class FillMacroListWorker(QtCore.QThread):
                     "https://github.com/FreeCAD/FreeCAD-macros.git", self.repo_dir
                 )
         except Exception as e:
-            FreeCAD.Console.PrintWarning(
+            FreeCAD.Console.PrintMessage(
                 translate(
-                    "AddonsInstaller", "An error occurred updating macros from GitHub"
+                    "AddonsInstaller", "An error occurred updating macros from GitHub, trying clean checkout..."
                 )
                 + f":\n{e}\n"
             )
-            FreeCAD.Console.PrintWarning(f"{self.repo_dir}\n")
-            return
+            FreeCAD.Console.PrintMessage(f"{self.repo_dir}\n")
+            FreeCAD.Console.PrintMessage(
+                translate(
+                    "AddonsInstaller", "Attempting to do a clean checkout..."
+                ) + "\n"
+            )
+            try:
+                shutil.rmtree(self.repo_dir, onerror=self.remove_readonly)
+                git.Repo.clone_from(
+                    "https://github.com/FreeCAD/FreeCAD-macros.git", self.repo_dir
+                )
+                FreeCAD.Console.PrintMessage(
+                    translate(
+                        "AddonsInstaller", "Clean checkout succeeded"
+                    )
+                    + "\n"
+                )
+            except Exception as e:
+                FreeCAD.Console.PrintWarning(
+                    translate(
+                        "AddonsInstaller", "Failed to update macros from GitHub -- try clearing the Addon Manager's cache."
+                    )
+                    + f":\n{str(e)}\n"
+                )
+                return
         n_files = 0
         for _, _, filenames in os.walk(self.repo_dir):
             n_files += len(filenames)
@@ -665,7 +689,9 @@ class FillMacroListWorker(QtCore.QThread):
                     macro = Macro(filename[:-8])  # Remove ".FCMacro".
                     macro.on_git = True
                     macro.src_filename = os.path.join(dirpath, filename)
+                    macro.fill_details_from_file(macro.src_filename)
                     repo = Addon.from_macro(macro)
+                    FreeCAD.Console.PrintLog(f"Found macro {repo.name}\n")
                     repo.url = "https://github.com/FreeCAD/FreeCAD-macros.git"
                     utils.update_macro_installation_details(repo)
                     self.add_macro_signal.emit(repo)
@@ -709,11 +735,18 @@ class FillMacroListWorker(QtCore.QThread):
                 macro_names.append(macname)
                 macro = Macro(macname)
                 macro.on_wiki = True
+                macro.parsed = False
                 repo = Addon.from_macro(macro)
                 repo.url = "https://wiki.freecad.org/Macros_recipes"
                 utils.update_macro_installation_details(repo)
                 self.add_macro_signal.emit(repo)
 
+    def remove_readonly(self, func, path, _) -> None:
+        """Remove a read-only file."""
+
+        os.chmod(path, stat.S_IWRITE)
+        func(path)
+
 
 class CacheMacroCode(QtCore.QThread):
     """Download and cache the macro code, and parse its internal metadata"""