diff --git a/trunk/user/LPRng/Makefile b/trunk/user/LPRng/Makefile
index aca48980d..76db02761 100644
--- a/trunk/user/LPRng/Makefile
+++ b/trunk/user/LPRng/Makefile
@@ -63,7 +63,7 @@ FILES=./postinstall ./preremove ./postremove ./lpd.conf
 ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/DOCS
 ROMFSDIR = $(ROOTDIR)/romfs
 
-CFLAGS  += -O2 -ffunction-sections -fdata-sections -fvisibility=hidden
+CFLAGS  += -ffunction-sections -fdata-sections -fvisibility=hidden
 LDFLAGS += -Wl,--gc-sections
 
 ###############################################################################
diff --git a/trunk/user/firefly/Makefile b/trunk/user/firefly/Makefile
index bcda0fb2f..ce834d936 100644
--- a/trunk/user/firefly/Makefile
+++ b/trunk/user/firefly/Makefile
@@ -2,7 +2,7 @@ SRC_NAME=mt-daapd-svn
 
 THISDIR = $(shell pwd)
 
-CFLAGS  += -O2 -ffunction-sections -fdata-sections
+CFLAGS  += -ffunction-sections -fdata-sections
 LDFLAGS += -Wl,--gc-sections
 
 all: config_test
diff --git a/trunk/user/httpd/Makefile b/trunk/user/httpd/Makefile
index 0ef614665..8d06cafab 100644
--- a/trunk/user/httpd/Makefile
+++ b/trunk/user/httpd/Makefile
@@ -8,7 +8,7 @@ SHDIR = $(ROOTDIR)/user/shared
 include $(SHDIR)/boards.mk
 include $(SHDIR)/cflags.mk
 
-CFLAGS  += -O2 -ffunction-sections -fdata-sections -fvisibility=hidden
+CFLAGS  += -ffunction-sections -fdata-sections -fvisibility=hidden
 LDFLAGS += -Wl,--gc-sections
 
 CFLAGS += $(if $(TPLINK_HWID),-DTPLINK_HWID=$(TPLINK_HWID),)
diff --git a/trunk/user/lua/lua-5.1.5/etc/Makefile b/trunk/user/lua/lua-5.1.5/etc/Makefile
index 6d00008d9..ac94cd23d 100644
--- a/trunk/user/lua/lua-5.1.5/etc/Makefile
+++ b/trunk/user/lua/lua-5.1.5/etc/Makefile
@@ -8,7 +8,7 @@ SRC= $(TOP)/src
 TST= $(TOP)/test
 
 CC= gcc
-CFLAGS= -O2 -Wall -I$(INC) $(MYCFLAGS)
+CFLAGS= -Os -Wall -I$(INC) $(MYCFLAGS)
 MYCFLAGS= 
 MYLDFLAGS= -Wl,-E
 MYLIBS= -lm
diff --git a/trunk/user/lua/lua-5.1.5/src/Makefile b/trunk/user/lua/lua-5.1.5/src/Makefile
index 3df29ce9a..30c606969 100644
--- a/trunk/user/lua/lua-5.1.5/src/Makefile
+++ b/trunk/user/lua/lua-5.1.5/src/Makefile
@@ -8,7 +8,7 @@
 PLAT= none
 
 CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS)
+CFLAGS= -Os -Wall $(MYCFLAGS)
 AR= ar rcu
 RANLIB= ranlib
 RM= rm -f
diff --git a/trunk/user/samba3/Makefile b/trunk/user/samba3/Makefile
index c1e41c993..4ed704301 100644
--- a/trunk/user/samba3/Makefile
+++ b/trunk/user/samba3/Makefile
@@ -4,9 +4,9 @@ SMBCFLAGS = -Wall -ffunction-sections -fdata-sections $(CFLAGS)
 SMBLDFLAGS = -Wl,--gc-sections $(LDFLAGS)
 
 ifeq ($(CONFIG_FIRMWARE_INCLUDE_SMBD_SYSLOG),y)
-SMBCFLAGS += -O2 -DMAX_DEBUG_LEVEL="0"
+SMBCFLAGS += -DMAX_DEBUG_LEVEL="0"
 else
-SMBCFLAGS += -Os -DMAX_DEBUG_LEVEL="-1"
+SMBCFLAGS += -DMAX_DEBUG_LEVEL="-1"
 endif
 
 THISDIR = $(shell pwd)
diff --git a/trunk/user/samba36/Makefile b/trunk/user/samba36/Makefile
index 8677917ef..5fc546d94 100644
--- a/trunk/user/samba36/Makefile
+++ b/trunk/user/samba36/Makefile
@@ -6,9 +6,9 @@ SMBCPPFLAGS = $(CPPFLAGS) -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64 -D_FILE_O
 MAKE_FLAGS = $(MAKEFLAGS) DYNEXP= PICFLAG= MODULES=
 
 ifeq ($(CONFIG_FIRMWARE_INCLUDE_SMBD_SYSLOG),y)
-SMBCFLAGS += -O2 -DMAX_DEBUG_LEVEL="0"
+SMBCFLAGS += -DMAX_DEBUG_LEVEL="0"
 else
-SMBCFLAGS += -Os -DMAX_DEBUG_LEVEL="-1"
+SMBCFLAGS += -DMAX_DEBUG_LEVEL="-1"
 endif
 
 all: config_test
diff --git a/trunk/user/transmission/Makefile b/trunk/user/transmission/Makefile
index ea90b619e..1f33c3665 100644
--- a/trunk/user/transmission/Makefile
+++ b/trunk/user/transmission/Makefile
@@ -1,6 +1,6 @@
 SRC_NAME=transmission-2.9X
 
-COMMON_FLAGS = -O2 -ffunction-sections -fdata-sections -fvisibility=hidden -D_LARGEFILE64_SOURCE -D_LFS64_LARGEFILE
+COMMON_FLAGS = -ffunction-sections -fdata-sections -fvisibility=hidden -D_LARGEFILE64_SOURCE -D_LFS64_LARGEFILE
 CFLAGS   += $(COMMON_FLAGS)
 CXXFLAGS += $(COMMON_FLAGS) -fvisibility-inlines-hidden
 LDFLAGS  += -Wl,--gc-sections
diff --git a/trunk/user/udpxy/Makefile b/trunk/user/udpxy/Makefile
index eb97a69bd..59f903467 100644
--- a/trunk/user/udpxy/Makefile
+++ b/trunk/user/udpxy/Makefile
@@ -29,7 +29,7 @@ GZIP  := /bin/gzip
 MKDEPOPT := -MM
 DEBUG_ON := -g
 
-ALL_CFLAGS  = -W -Wall -Werror --pedantic $(CFLAGS) -O2
+ALL_CFLAGS  = -W -Wall -Werror --pedantic $(CFLAGS)
 ALL_CFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden
 
 LDFLAGS += -Wl,--gc-sections
diff --git a/trunk/user/vsftpd/Makefile b/trunk/user/vsftpd/Makefile
index c2fa852dd..19e48dd2a 100644
--- a/trunk/user/vsftpd/Makefile
+++ b/trunk/user/vsftpd/Makefile
@@ -4,7 +4,7 @@ TOP	 = $(ROOTDIR)/user
 
 IFLAGS	 = -idirafter dummyinc
 
-CFLAGS	+= -O2 -Wall -W -Werror -Wshadow -Wformat-security -D_FORTIFY_SOURCE=2
+CFLAGS	+= -Wall -W -Werror -Wshadow -Wformat-security -D_FORTIFY_SOURCE=2
 CFLAGS	+= -I$(TOP)/shared
 CFLAGS	+= -I$(TOP)/libdisk
 CFLAGS	+= -ffunction-sections -fdata-sections -fvisibility=hidden
diff --git a/trunk/vendors/config/mips/config.arch b/trunk/vendors/config/mips/config.arch
index bf77e0438..c6906a5b1 100644
--- a/trunk/vendors/config/mips/config.arch
+++ b/trunk/vendors/config/mips/config.arch
@@ -107,7 +107,7 @@ ifdef UCLINUX_BUILD_LIB
   ifdef CONFIG_LIB_DEBUG
 	CFLAGS  :=  $(if $(LOPT),$(LOPT),-O1) -g
   else
-	CFLAGS  :=  $(if $(LOPT),$(LOPT),-O2) -fomit-frame-pointer -fno-stack-protector -femit-struct-debug-baseonly -fno-var-tracking
+	CFLAGS  :=  $(if $(LOPT),$(LOPT),-Os) -fomit-frame-pointer -fno-stack-protector -femit-struct-debug-baseonly -fno-var-tracking
   endif
 	CFLAGS  += -pipe
 	CFLAGS  += $(VENDOR_CFLAGS)