diff --git a/README.md b/README.md
index 769588b833..e8e7a09850 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Arduino core for ESP8266 WiFi chip
-===========================================
+Arduino core for ESP8266 WiFi chip - Kniwwelino Fork
+====================================================
 
 This project brings support for ESP8266 chip to the Arduino environment. It lets you write sketches using familiar Arduino functions and libraries, and run them directly on ESP8266, no external microcontroller required.
 
@@ -22,7 +22,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 
 - Install Arduino 1.6.8 from the [Arduino website](http://www.arduino.cc/en/main/software).
 - Start Arduino and open Preferences window.
-- Enter ```http://arduino.esp8266.com/stable/package_esp8266com_index.json``` into *Additional Board Manager URLs* field. You can add multiple URLs, separating them with commas.
+- Enter ```http://doku.kniwwelino.lu/_media/en/download/package_esp8266_kniwwelino_index.json``` into *Additional Board Manager URLs* field. You can add multiple URLs, separating them with commas.
 - Open Boards Manager from Tools > Board menu and install *esp8266* platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).
 
 The best place to ask questions related to this core is ESP8266 community forum: http://www.esp8266.com/arduino.
@@ -32,15 +32,10 @@ If you find this forum or the ESP8266 Boards Manager package useful, please cons
 #### Available versions
 
 ##### Stable version ![](http://arduino.esp8266.com/stable/badge.svg)
-Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
+Boards manager link: `http://doku.kniwwelino.lu/_media/en/download/package_esp8266_kniwwelino_index.json`
 
 Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0/](http://esp8266.github.io/Arduino/versions/2.2.0/)
 
-##### Staging version ![](http://arduino.esp8266.com/staging/badge.svg)
-Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_index.json`
-
-Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0-rc1/](http://esp8266.github.io/Arduino/versions/2.2.0-rc1/)
-
 ### Using git version
 [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino) [![codecov.io](https://codecov.io/github/esp8266/Arduino/coverage.svg?branch=master)](https://codecov.io/github/esp8266/Arduino?branch=master)
 
diff --git a/boards.txt b/boards.txt
index 1519bba24d..dc572c9a9b 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1271,6 +1271,7 @@ d1_mini.build.variant=d1_mini
 d1_mini.build.flash_mode=dio
 d1_mini.build.flash_size=4M
 d1_mini.build.flash_freq=40
+d1_mini.build.flash_ld=eagle.flash.4m.ld
 d1_mini.build.debug_port=
 d1_mini.build.debug_level=
 
@@ -1873,3 +1874,70 @@ coredev.menu.DebugLevel.OTA2____=OTA + Updater
 coredev.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
 coredev.menu.DebugLevel.all_____=All
 coredev.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
+
+
+##############################################################
+kniwwelino.name=Kniwwelino
+
+kniwwelino.upload.tool=esptool
+kniwwelino.upload.speed=460800
+kniwwelino.upload.resetmethod=nodemcu
+kniwwelino.upload.maximum_size=1044464
+kniwwelino.upload.maximum_data_size=81920
+kniwwelino.upload.wait_for_upload_port=true
+kniwwelino.serial.disableDTR=true
+kniwwelino.serial.disableRTS=true
+
+kniwwelino.build.mcu=esp8266
+kniwwelino.build.f_cpu=80000000L
+kniwwelino.build.board=ESP8266_WEMOS_D1MINI
+kniwwelino.build.core=esp8266
+kniwwelino.build.variant=d1_mini
+kniwwelino.build.flash_mode=dio
+kniwwelino.build.flash_size=4M
+kniwwelino.build.flash_freq=40
+kniwwelino.build.flash_ld=eagle.flash.4m.ld
+kniwwelino.build.debug_port=
+kniwwelino.build.debug_level=
+
+kniwwelino.menu.CpuFrequency.80=80 MHz
+kniwwelino.menu.CpuFrequency.80.build.f_cpu=80000000L
+kniwwelino.menu.CpuFrequency.160=160 MHz
+kniwwelino.menu.CpuFrequency.160.build.f_cpu=160000000L
+
+kniwwelino.menu.UploadSpeed.921600=921600
+kniwwelino.menu.UploadSpeed.921600.upload.speed=921600
+kniwwelino.menu.UploadSpeed.115200=115200
+kniwwelino.menu.UploadSpeed.115200.upload.speed=115200
+kniwwelino.menu.UploadSpeed.9600=9600
+kniwwelino.menu.UploadSpeed.9600.upload.speed=9600
+kniwwelino.menu.UploadSpeed.57600=57600
+kniwwelino.menu.UploadSpeed.57600.upload.speed=57600
+kniwwelino.menu.UploadSpeed.256000.windows=256000
+kniwwelino.menu.UploadSpeed.256000.upload.speed=256000
+kniwwelino.menu.UploadSpeed.230400.linux=230400
+kniwwelino.menu.UploadSpeed.230400.macosx=230400
+kniwwelino.menu.UploadSpeed.230400.macosx=230400
+kniwwelino.menu.UploadSpeed.230400.upload.speed=230400
+kniwwelino.menu.UploadSpeed.460800.linux=460800
+kniwwelino.menu.UploadSpeed.460800.macosx=460800
+kniwwelino.menu.UploadSpeed.460800.upload.speed=460800
+kniwwelino.menu.UploadSpeed.512000.windows=512000
+kniwwelino.menu.UploadSpeed.512000.upload.speed=512000
+
+
+kniwwelino.menu.FlashSize.4M3M=4M (3M SPIFFS)
+kniwwelino.menu.FlashSize.4M3M.build.flash_size=4M
+kniwwelino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+kniwwelino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+kniwwelino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+kniwwelino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+kniwwelino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+kniwwelino.menu.FlashSize.4M1M=4M (1M SPIFFS)
+kniwwelino.menu.FlashSize.4M1M.build.flash_size=4M
+kniwwelino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+kniwwelino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+kniwwelino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+kniwwelino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+kniwwelino.menu.FlashSize.4M1M.build.spiffs_pagesize=256