diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index f8befc969..a38ff004e 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -293,10 +293,6 @@ ifndef OPTOPT
             OPTOPT=
         endif
     endif
-
-    ifneq (,$(CUSTOMOPT))
-        OPTOPT+= $(CUSTOMOPT)
-    endif
 endif
 
 ifneq (0,$(KRANDDEBUG))
@@ -398,6 +394,12 @@ ifneq (0,$(RELEASE))
     ifneq (0,$(LTO))
         BASELDFLAGS+= -flto
         debug+= -DUSING_LTO -flto
+        ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
+            ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 9)))
+                BASELDFLAGS+= -ffat-lto-objects
+                debug+= -ffat-lto-objects
+            endif
+        endif
     endif
 else
     # Debugging enabled
@@ -575,3 +577,9 @@ EROOT:=build
 
 # will be potentially overridden in build/Makefile.shared
 EXESUFFIX=
+
+
+ifneq (,$(CUSTOMOPT))
+    BASECOMMONFLAGS+= $(CUSTOMOPT)
+    BASELDFLAGS+= $(CUSTOMOPT)
+endif
diff --git a/polymer/eduke32/build/src/kplib.c b/polymer/eduke32/build/src/kplib.c
index b39c607d3..605cf85f7 100644
--- a/polymer/eduke32/build/src/kplib.c
+++ b/polymer/eduke32/build/src/kplib.c
@@ -92,6 +92,7 @@ static __inline int32_t _lrotl(int32_t i, int sh)
 #endif
 
 #if defined(__GNUC__)
+#undef _inline
 #define _inline inline
 #endif