diff --git a/make/environment-build.mk b/make/environment-build.mk
index 34838385..aff7da9a 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -173,7 +173,7 @@ ifeq ($(BOXSERIES), hd1)
   DRIVERS_DIR            = nevis
   CORTEX-STRINGS         =
   TARGET                 = arm-cx2450x-linux-gnueabi
-  TARGET_O_CFLAGS        = -Os
+  TARGET_OPTIMIZATION    = -Os
   TARGET_MARCH_CFLAGS    = -march=armv6 -mfloat-abi=soft -mlittle-endian
   TARGET_EXTRA_CFLAGS    = -fdata-sections -ffunction-sections
   TARGET_EXTRA_LDFLAGS   = -Wl,--gc-sections
@@ -191,12 +191,12 @@ else ifeq ($(BOXSERIES), hd2)
   endif
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-uclibcgnueabi
-  TARGET_O_CFLAGS        = -O2
+  TARGET_OPTIMIZATION    = -O2
   TARGET_MARCH_CFLAGS    = -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
   ifeq ($(BOXMODEL), kronos_v2)
-    TARGET_O_CFLAGS      = -Os
+    TARGET_OPTIMIZATION  = -Os
     TARGET_EXTRA_CFLAGS  = -fdata-sections -ffunction-sections
     TARGET_EXTRA_LDFLAGS = -Wl,--gc-sections
   endif
@@ -209,7 +209,7 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
   DRIVERS_DIR            = $(BOXSERIES)
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-gnueabihf
-  TARGET_O_CFLAGS        = -O2
+  TARGET_OPTIMIZATION    = -O2
   TARGET_MARCH_CFLAGS    = -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   =
@@ -224,7 +224,7 @@ TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION)
 TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
 TARGET_SHARE_DIR = $(TARGET_DIR)/share
 
-TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
+TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGET_LIB_DIR) -Wl,-rpath-link,$(TARGET_LIB_DIR) -L$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 6a2b05df..6b210510 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -107,7 +107,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 			--infodir=/.remove \
 			--with-pid-dir=/tmp \
 			--with-privsep-path=/var/empty \
-			--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \
+			--with-cppflags="-pipe $(TARGET_OPTIMIZATION) $(TARGET_MARCH_CFLAGS) -g -I$(TARGET_INCLUDE_DIR)" \
 			--with-ldflags="-L$(TARGET_LIB_DIR)" \
 			--libexecdir=/bin \
 			--disable-strip \