diff --git a/Makefile b/Makefile
index 866fabe..8b7050f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # - 2014-11-23: Updated for SDK 0.9.3
 # - 2014-12-25: Replaced esptool by esptool.py
 
-BUILD_AREA = /home/martin/github
+BUILD_AREA = $(CURDIR)/..
 
 # Output directors to store intermediate compiled files
 # relative to the project directory
@@ -43,11 +43,11 @@ LIB_MODULES	= mqtt
 LIBS		= c gcc hal pp phy net80211 lwip wpa main ssl json
 
 # compiler flags using during compilation of source files
-CFLAGS		= -Os -g -O2 -Wpointer-arith -Wundef -Werror -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH -DUSE_OPTIMIZE_PRINTF -Desp8266
+CFLAGS		= -Os -ffunction-sections -fdata-sections -g -O2 -Wpointer-arith -Wundef -Werror -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH -DUSE_OPTIMIZE_PRINTF -Desp8266
 #-DMQTT_DEBUG_ON
 
 # linker flags used to generate the main object file
-LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
+LDFLAGS		= -ffunction-sections -fdata-sections -Wl,-gc-sections -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
 
 # linker script used for the above linkier step
 LD_SCRIPT	= eagle.app.v6.ld
diff --git a/README.md b/README.md
index abf135e..ff6b1fb 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,7 @@ To adjust memory consumption of one MQTT connection and thus the max number of c
 Also there is a hard limitation on the number of STAs connected to the SoftAP, which is 8. I.e. when using the esp_uMQTT_broker only with clients via the SoftAP interface, even with reduced memory consumtion, the limit of different client nodes is still 8, as it is imposed by the binary WiFi driver. Only when used via the STA interface and an external AP you can connect more than 8 MQTT clients.
 
 # Thanks
-- pfalcon for esp_open_sdk (https://github.com/martin-ger/esp-open-sdk)
+- pfalcon for esp_open_sdk (best with NONOS SDK V2.2 patches - https://github.com/xxxajk/esp-open-lwip)
 - tuanpmt for esp_mqtt (https://github.com/tuanpmt/esp_mqtt )
 - eadf for esp8266_easygpio (https://github.com/eadf/esp8266_easygpio )
 - Stefan Brüns for ESP8266_new_pwm (https://github.com/StefanBruens/ESP8266_new_pwm )
diff --git a/firmware/0x00000.bin b/firmware/0x00000.bin
index 5f4ade2..00f8ab9 100644
Binary files a/firmware/0x00000.bin and b/firmware/0x00000.bin differ
diff --git a/firmware/0x10000.bin b/firmware/0x10000.bin
index fc6cf9b..c033b91 100644
Binary files a/firmware/0x10000.bin and b/firmware/0x10000.bin differ
diff --git a/firmware/sha1sums b/firmware/sha1sums
index 6d30c02..e58ff2f 100644
--- a/firmware/sha1sums
+++ b/firmware/sha1sums
@@ -1,2 +1,2 @@
-0388ae2e0e8a790a8bc05f58af545364a7450b20  0x00000.bin
-a375ec4ac364e900b5526b06f475e6b769547476  0x10000.bin
+7163ff45862ab01f061e256cd16ad1e083fe8df0  0x00000.bin
+92fdb9a489a04461351fff59ac94adc618a3d17d  0x10000.bin
diff --git a/user/user_config.h b/user/user_config.h
index 02330b6..5057a72 100644
--- a/user/user_config.h
+++ b/user/user_config.h
@@ -1,7 +1,7 @@
 #ifndef _USER_CONFIG_
 #define _USER_CONFIG_
 
-#define ESP_UBROKER_VERSION "V2.0.6"
+#define ESP_UBROKER_VERSION "V2.0.7"
 
 #define WIFI_SSID            "ssid"
 #define WIFI_PASSWORD        "password"