diff --git a/src/base/_foundation.lua b/src/base/_foundation.lua
index cd5e8128..16e91ddb 100644
--- a/src/base/_foundation.lua
+++ b/src/base/_foundation.lua
@@ -159,6 +159,18 @@
 		scope[name] = function(...)
 			return repl(original, ...)
 		end
+
+		-- Functions from premake.main are special in that they are fetched
+		-- from an array, which can be modified by system and project scripts,
+		-- instead of a function which would have already been called before
+		-- those scripts could have run. Since the array will have already
+		-- been evaluated by the time override() is called, the new value
+		-- won't be picked up as it would with the function-fetched call
+		-- lists. Special case the workaround for that here so everyone else
+		-- can just override without having to think about the difference.
+		if scope == premake.main then
+			table.replace(premake.main.elements, original, scope[name])
+		end
 	end
 
 
diff --git a/src/base/table.lua b/src/base/table.lua
index 46c93c16..548455ab 100644
--- a/src/base/table.lua
+++ b/src/base/table.lua
@@ -293,6 +293,25 @@
 	end
 
 
+---
+-- Replace all instances of `value` with `replacement` in an array. Array
+-- elements are modified in place.
+--
+-- @param value
+--    The value to be replaced.
+-- @param replacement
+--    The new value.
+---
+
+	function table.replace(self, value, replacement)
+		for i = 1, #self do
+			if self[i] == value then
+				self[i] = replacement
+			end
+		end
+	end
+
+
 --
 -- Translates the values contained in array, using the specified
 -- translation table, and returns the results in a new array.
@@ -317,26 +336,26 @@
 	end
 
 
--- 
+--
 -- Dumps a table to a string
--- 
+--
 	function table.tostring(tab, recurse, indent)
 		local res = ''
-	
-		if not indent then 
-			indent = 0 
+
+		if not indent then
+			indent = 0
 		end
 
 		local format_value = function(k, v, i)
 			formatting = string.rep("\t", i)
-			
+
 			if k then
 				if type(k) == "table" then
 					k = '[table]'
 				end
 				formatting = formatting .. k .. ": "
 			end
-		
+
 			if not v then
 				return formatting .. '(nil)'
 			elseif type(v) == "table" then
@@ -359,20 +378,20 @@
 				return formatting .. v
 			end
 		end
-		
+
 		if type(tab) == "table" then
 			local first = true
 			for k, v in pairs(tab) do
 				if not first then
 					res = res .. '\n'
 				end
-			
+
 				res = res .. format_value(k, v, indent)
 				first = false
-			end 
+			end
 		else
 			res = res .. format_value(nil, tab, indent)
 		end
-		
+
 		return res
 	end