diff --git a/.gitmodules b/.gitmodules
index 75a3cdeb..d64286a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
 [submodule "deps/libtomcrypt"]
 	path = deps/libtomcrypt
 	url = https://github.com/libtom/libtomcrypt
+[submodule "deps/tomsfastmath"]
+	path = deps/tomsfastmath
+	url = https://github.com/libtom/tomsfastmath.git
diff --git a/deps/tomsfastmath b/deps/tomsfastmath
new file mode 160000
index 00000000..d5795fda
--- /dev/null
+++ b/deps/tomsfastmath
@@ -0,0 +1 @@
+Subproject commit d5795fda3584c728c19db77b26fe28ee42453585
diff --git a/premake5.lua b/premake5.lua
index 5ee43db2..2fe960ef 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -207,11 +207,7 @@ workspace "iw4x"
 			defines { "_LIB", "LTC_SOURCE", "LTC_NO_RSA_BLINDING" }
 			includedirs { "./deps/libtomcrypt/src/headers"  }
 
-			files
-			{
-				"./deps/libtomcrypt/src/**.c",
-				"./deps/libtomcrypt/src/**.h"
-			}
+			files { "./deps/libtomcrypt/src/**.c" }
 			
 			-- remove ocb3 code
 			removefiles { "./deps/libtomcrypt/src/encauth/ocb3/**.c" }
@@ -221,3 +217,20 @@ workspace "iw4x"
 
 			-- always build as static lib, as pdcurses doesn't export anything
 			kind "StaticLib"
+			
+		-- tomsfastmath
+		project "tomsfastmath"
+			language "C"
+			defines { "_LIB" }
+			includedirs { "./deps/tomsfastmath/src/headers"  }
+
+			files { "./deps/tomsfastmath/src/**.c" }
+			
+			-- remove generator code
+			removefiles { "./deps/tomsfastmath/src/generators/**.c" }
+
+			-- not our code, ignore POSIX usage warnings for now
+			warnings "Off"
+
+			-- always build as static lib, as pdcurses doesn't export anything
+			kind "StaticLib"