diff --git a/addons/compat_cup_terrains/$PBOPREFIX$ b/addons/compat_cup_terrains/$PBOPREFIX$
new file mode 100644
index 0000000000..f904236cf3
--- /dev/null
+++ b/addons/compat_cup_terrains/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\compat_cup_terrains
diff --git a/addons/compat_cup_terrains/CfgEventHandlers.hpp b/addons/compat_cup_terrains/CfgEventHandlers.hpp
new file mode 100644
index 0000000000..9cc1b0427b
--- /dev/null
+++ b/addons/compat_cup_terrains/CfgEventHandlers.hpp
@@ -0,0 +1,5 @@
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
diff --git a/addons/compat_cup_terrains/CfgVehicles.hpp b/addons/compat_cup_terrains/CfgVehicles.hpp
new file mode 100644
index 0000000000..08176b77fe
--- /dev/null
+++ b/addons/compat_cup_terrains/CfgVehicles.hpp
@@ -0,0 +1,48 @@
+class CfgVehicles {
+    class House;
+    class House_Small_F;
+    class Strategic;
+    class House_EP1: House {};
+
+    class Land_Benzina_schnell: House {
+        transportFuel = 0;
+        EGVAR(refuel,hooks)[] = {{-1.5,-3.93,-1.25}, {2.35,-3.93,-1.25}};
+        EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
+        class ACE_Actions {
+            class ACE_MainActions {
+                displayName = ECSTRING(interaction,MainAction);
+                position = "[0,-3.93,-1.25]";
+                distance = 5;
+                condition = "true";
+            };
+        };
+    };
+    class Land_A_FuelStation_Feed: Strategic {
+        transportFuel = 0;
+        EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
+        EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
+    };
+    class Land_Ind_FuelStation_Feed_EP1: House_EP1 {
+        transportFuel = 0;
+        EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
+        EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
+    };
+    class Land_FuelStation_Feed_PMC: Strategic {
+        transportFuel = 0;
+        EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
+        EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
+    };
+    class FuelStation: House_Small_F {
+        transportFuel = 0;
+        EGVAR(refuel,hooks)[] = {{1.25, .2, -1.1}};
+        EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
+        class ACE_Actions {
+            class ACE_MainActions {
+                displayName = ECSTRING(interaction,MainAction);
+                position = "[1.25, .2, -1]";
+                distance = 5;
+                condition = "true";
+            };
+        };
+    };
+};
diff --git a/addons/compat_cup_terrains/XEH_postInit.sqf b/addons/compat_cup_terrains/XEH_postInit.sqf
new file mode 100644
index 0000000000..32b9393d98
--- /dev/null
+++ b/addons/compat_cup_terrains/XEH_postInit.sqf
@@ -0,0 +1,5 @@
+#include "script_component.hpp"
+
+if (["CUP_Terrains_ACE_compat"] call EFUNC(common,isModLoaded)) exitWith {
+    ERROR_WITH_TITLE("Duplicate CUP/ACE Compats","Compats are now part of ACE - Uninstall 'CUP ACE3 Compatibility Addon - Terrains'");
+};
diff --git a/addons/compat_cup_terrains/config.cpp b/addons/compat_cup_terrains/config.cpp
new file mode 100644
index 0000000000..a7020be4da
--- /dev/null
+++ b/addons/compat_cup_terrains/config.cpp
@@ -0,0 +1,27 @@
+#include "script_component.hpp"
+#include "\z\ace\addons\refuel\defines.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "CABuildings",
+            "CAStructuresHouse_A_FuelStation",
+            "CAStructures_E_Ind_Ind_FuelStation",
+            "CAStructures_PMC_FuelStation",
+            "CUP_Buildings_Config",
+            "ace_refuel" // not a sub-component because it's all this compat does
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Community Upgrade Project", "Mike"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgVehicles.hpp"
+#include "CfgEventHandlers.hpp"
diff --git a/addons/compat_cup_terrains/script_component.hpp b/addons/compat_cup_terrains/script_component.hpp
new file mode 100644
index 0000000000..633de5584b
--- /dev/null
+++ b/addons/compat_cup_terrains/script_component.hpp
@@ -0,0 +1,5 @@
+#define COMPONENT compat_cup_terrains
+#define COMPONENT_BEAUTIFIED CUP Terrains Compatibility
+
+#include "\z\ace\addons\main\script_mod.hpp"
+#include "\z\ace\addons\main\script_macros.hpp"