diff --git a/makefiles/setup.mk b/makefiles/setup.mk
index 1c6e5c3a2e..fd4cbb1a77 100644
--- a/makefiles/setup.mk
+++ b/makefiles/setup.mk
@@ -33,8 +33,8 @@
 # Path and tool setup
 #
 
-export PX4_TARGET_OS	 = nuttx
-#export PX4_TARGET_OS	 = linux
+#export PX4_TARGET_OS	 = nuttx
+export PX4_TARGET_OS	 = linux
 
 #
 # Some useful paths.
diff --git a/makefiles/toolchain_native.mk b/makefiles/toolchain_native.mk
index bb791195eb..91fafc6efd 100644
--- a/makefiles/toolchain_native.mk
+++ b/makefiles/toolchain_native.mk
@@ -114,7 +114,7 @@ ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
 # Language-specific flags
 #
 ARCHCFLAGS		 = -std=gnu99 -g
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++11 -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g
+ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++0x -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g
 
 # Generic warnings
 #