diff --git a/README.md b/README.md
index b6023e58..18d03613 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ If you would like to support the developer with a cup of coffee you can do that
 ##### Rolling - (2021-03-21)
 
 * Bug fixing in `html.zip`
+* Bug fixing: restart after renaming hostname in `config.ini` did not work reliable
 * based on v6.4.0
 
 ##### 6.4.0 Image Processing in Memory - (2021-03-20)
diff --git a/code/components/connect_wlan/connect_wlan.cpp b/code/components/connect_wlan/connect_wlan.cpp
index aa2ea5d9..e01b6bcf 100644
--- a/code/components/connect_wlan/connect_wlan.cpp
+++ b/code/components/connect_wlan/connect_wlan.cpp
@@ -292,11 +292,14 @@ bool ChangeHostName(std::string fn, std::string _newhostname)
 
     for (int i = 0; i < neuesfile.size(); ++i)
     {
+        printf(neuesfile[i].c_str());
         fputs(neuesfile[i].c_str(), pFile);
     }
 
     fclose(pFile);
 
+    printf("*** Update hostname done ***\n");
+
     return true;
 }
 
diff --git a/code/components/jomjol_fileserver_ota/server_ota.h b/code/components/jomjol_fileserver_ota/server_ota.h
index 622fd0a8..e227d146 100644
--- a/code/components/jomjol_fileserver_ota/server_ota.h
+++ b/code/components/jomjol_fileserver_ota/server_ota.h
@@ -9,4 +9,5 @@ static const char *TAGPARTOTA = "server_ota";
 void register_server_ota_sdcard_uri(httpd_handle_t server);
 void CheckOTAUpdate();
 void doReboot();
+void hard_restart();
 
diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
index 3d846f6c..4bf307e2 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -382,6 +382,9 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
             {
                 // reboot notwendig damit die neue wlan.ini auch benutzt wird !!!
                 fclose(pfile);
+                printf("do reboot\n");
+                esp_restart();
+                hard_restart();                   
                 doReboot();
             }
         }
diff --git a/code/main/version.cpp b/code/main/version.cpp
index fb45468b..53074a14 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="3b3d924";
+const char* GIT_REV="a0ebf35";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-17 22:46";
\ No newline at end of file
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-21 20:49";
\ No newline at end of file
diff --git a/code/main/version.h b/code/main/version.h
index a03713f9..cb2060b2 100644
--- a/code/main/version.h
+++ b/code/main/version.h
@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v6.3.1 - 2020-03-16";
+const char* GIT_BASE_BRANCH = "master - v6.4.0 - 2020-03-20";
 
 
 const char* git_base_branch(void)
diff --git a/code/version.cpp b/code/version.cpp
index fb45468b..53074a14 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="3b3d924";
+const char* GIT_REV="a0ebf35";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-17 22:46";
\ No newline at end of file
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-21 20:49";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index b344a09a..797f6637 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 13919ed3..96594e46 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ