diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index d0bb8e6a0..13169700e 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -152,6 +152,13 @@ let
         in
         (machineImports settings)
         ++ [
+          {
+            # Autoinclude configuration.nix and hardware-configuration.nix
+            imports = builtins.filter (p: builtins.pathExists p) [
+              "${directory}/machines/${name}/configuration.nix"
+              "${directory}/machines/${name}/hardware-configuration.nix"
+            ];
+          }
           settings
           clan-core.nixosModules.clanCore
           extraConfig