diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 0076d2cde..1cbe7a9b4 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -335,6 +335,11 @@ endif
 
 debug+= -O$(OPTLEVEL)
 
+# See http://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
+# for a list of possible UBSan options.
+# Clang 3.2 does only supports -fsanitize=address for the AddressSanitizer
+CLANG_DEBUG_FLAGS := -fsanitize=address -fsanitize=bounds,enum,float-cast-overflow,object-size
+
 ifneq (0,$(RELEASE))
     # Debugging disabled
     ifeq (0,$(CLANG))
@@ -366,13 +371,7 @@ else
     endif
 
     ifneq (0,$(CLANG))
-        # KEEPINSYNC with build/Makefile:
-        # Older Clang (2.9?)
-#        BASECFLAGS+= -Xclang -fcatch-undefined-behavior
-        # Clang 3.2
-#        debug+= -fsanitize=address
-        # Clang 3.3 or SVN
-        debug+= -fsanitize=address -fsanitize=undefined
+        debug+= $(CLANG_DEBUG_FLAGS)
     endif
     ifeq ($(SUBPLATFORM),LINUX)
         BASELIBS+=-rdynamic
diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile
index c3ef61cc5..1ac10a1ad 100644
--- a/polymer/eduke32/build/Makefile
+++ b/polymer/eduke32/build/Makefile
@@ -291,8 +291,7 @@ $(OBJ)/%.$o: $(SRC)/%.nasm
 # Comment out the following rule to debug a-c.o
 $(OBJ)/a-c.$o: $(SRC)/a-c.c
 	$(COMPILE_STATUS)
-	if $(COMPILER) $(subst -O$(OPTLEVEL),-O2,$(subst -fsanitize=address -fsanitize=undefined,,$(OURCFLAGS))) -c $< -o $@; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
-# KEEPINSYNC the Clang -f option(s) with Makefile.common
+	if $(COMPILER) $(subst -O$(OPTLEVEL),-O2,$(subst $(CLANG_DEBUG_FLAGS),,$(OURCFLAGS))) -c $< -o $@; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
 
 $(OBJ)/%.$o: $(SRC)/%.c
 	$(COMPILE_STATUS)