diff --git a/Rules.mak b/Rules.mak
index 8d0e66a..cd343f5 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -1,4 +1,4 @@
-# Rules.make for uClibc
+# Rules.mak for uClibc
 #
 # Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
@@ -170,7 +170,6 @@ headers_dep := $(top_builddir)include/bits/sysnum.h \
 	$(top_builddir)include/bits/uClibc_config.h
 sub_headers := $(headers_dep)
 
-#LIBS :=$(interp) -L$(top_builddir)lib -lc
 LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(ABI_VERSION)=)
 
 # Make sure DESTDIR and PREFIX can be used to install
@@ -410,6 +409,8 @@ ifeq ($(TARGET_ARCH),mips)
 	CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64
 	CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32
 	CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32
+	CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=-mnan=legacy
+	CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=-mnan=2008
 	CPU_LDFLAGS-y += $(CPU_CFLAGS)
 endif
 
@@ -593,10 +594,9 @@ WARNING_FLAGS += \
 	-Wnonnull \
 	-Wold-style-declaration \
 	-Wold-style-definition \
+	-Wdeclaration-after-statement \
 	-Wshadow \
 	-Wundef
-# Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc()
-#WARNING_FLAGS-gcc-4 += -Wdeclaration-after-statement
 endif
 WARNING_FLAGS += $(WARNING_FLAGS-gcc-$(GCC_MAJOR_VER))
 $(foreach w,$(WARNING_FLAGS),$(eval $(call check-gcc-var,$(w))))
@@ -638,9 +638,6 @@ $(eval $(call check-ld-var,--sort-common))
 $(eval $(call check-ld-var,--discard-all))
 LDFLAGS_NOSTRIP:=$(LDFLAG-fuse-ld) $(CPU_LDFLAGS-y) -shared \
 	-Wl,--warn-common $(CFLAG_-Wl--warn-once) -Wl,-z,combreloc
-# binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
-#$(eval $(call check-ld-var,--gc-sections))
-#LDFLAGS_NOSTRIP += $(LDFLAG_--gc-sections)
 
 ifeq ($(UCLIBC_BUILD_RELRO),y)
 LDFLAGS_NOSTRIP+=-Wl,-z,relro
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 919e80c..8137d8b 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -32,6 +32,21 @@ config CONFIG_MIPS_N64_ABI
 
 endchoice
 
+choice
+	prompt "Target NAN Encoding"
+	default CONFIG_MIPS_NAN_LEGACY
+	help
+	  This is the NAN Encoding you want to use.  Chose either Legacy
+	  or 2008.
+
+config CONFIG_MIPS_NAN_LEGACY
+	bool "LEGACY"
+
+config CONFIG_MIPS_NAN_2008
+	bool "2008"
+
+endchoice
+
 config UCLIBC_USE_MIPS_PREFETCH
 	bool "Use MIPS prefetch optimization for memcpy/memset"
 	default y
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index dde6a53..993aeb9 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -82,6 +82,9 @@ $(ldso:.$(ABI_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
 	$(call link.so,$(ldso_FULL_NAME),$(ABI_VERSION))
 	# link for backward compatibility
 	(cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME).so.0 )
+ifeq ($(CONFIG_MIPS_NAN_2008),y)
+	(cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME)-mipsn8.so.0)
+endif
 
 $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
 	$(Q)$(RM) $@