diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
new file mode 100644
index 0000000000..1556bbd907
--- /dev/null
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -0,0 +1,23 @@
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2011.
+#
+#  dean [at] fourwalledcubicle [dot] com
+#           www.lufa-lib.org
+#
+
+# Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.
+
+# Path to the root of the LUFA tree to scan
+LUFA_ROOT_PATH   = ../../
+
+# Filenames or directories (including fragments) to exclude from the analysis
+EXCLUDE_LIST     = HostLoaderApp/ FATFs/ PetiteFATFs/ uip/
+
+# Output message template for found warnings and errors
+MESSAGE_TEMPLATE = "{file}({line}): {severity} ({id}): {message}"
+
+all:
+	cppcheck -q -f --error-exitcode=1 --template $(MESSAGE_TEMPLATE) --enable=style --suppress=variableScope $(EXCLUDE_LIST:%=-i%) $(LUFA_ROOT_PATH)
+	
+%:
\ No newline at end of file
diff --git a/BuildTests/makefile b/BuildTests/makefile
index 26b29ed9bb..e296436139 100644
--- a/BuildTests/makefile
+++ b/BuildTests/makefile
@@ -13,8 +13,9 @@
 all:
 	$(MAKE) -C ModuleTest all
 	$(MAKE) -C SingleUSBModeTest all
+	$(MAKE) -C StaticAnalysisTest all
 
 %:
 	$(MAKE) -C ModuleTest $@
 	$(MAKE) -C SingleUSBModeTest $@
-
+	$(MAKE) -C StaticAnalysisTest $@