diff --git a/Makefile.linux b/Makefile.linux
index 2955d3011cc..aa67626a0ca 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -15,7 +15,7 @@ ifeq ($(shell expr match $(CXX) 'clang'),5)
 	NEEDED_CXXFLAGS += -std=c++17
 else ifeq ($(shell expr match ${CXXVER} "7"),1) # gcc 7
 	NEEDED_CXXFLAGS += -std=c++17
-	LDLIBS = -lboost_filesystem 
+	LDLIBS = -lboost_filesystem
 else ifeq ($(shell expr match ${CXXVER} "[8-9]"),1) # gcc 8 - 9
 	NEEDED_CXXFLAGS += -std=c++17
 	LDLIBS = -lstdc++fs
diff --git a/Makefile.mingw b/Makefile.mingw
index 339cec4ef52..fc92e9b02fd 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -7,7 +7,7 @@ CXXFLAGS := $(CXX_DEBUG) -fPIC -msse
 INCFLAGS := -I$(DAEMON_SRC_DIR) -IWin32
 LDFLAGS := ${LD_DEBUG} -static -fPIC -msse
 
-NEEDED_CXXFLAGS += -std=c++17
+NEEDED_CXXFLAGS += -std=c++20
 DEFINES += -DWIN32_LEAN_AND_MEAN
 
 # UPNP Support
@@ -16,7 +16,12 @@ ifeq ($(USE_UPNP),yes)
 	LDLIBS = -lminiupnpc
 endif
 
+ifeq ($(USE_WINXP_FLAGS), yes)
+	DEFINES += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
+endif
+
 LDLIBS += \
+	$(MINGW_PREFIX)/lib/libboost_filesystem-mt.a \
 	$(MINGW_PREFIX)/lib/libboost_program_options-mt.a \
 	$(MINGW_PREFIX)/lib/libssl.a \
 	$(MINGW_PREFIX)/lib/libcrypto.a \
@@ -37,10 +42,6 @@ ifeq ($(USE_WIN32_APP), yes)
 	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
 endif
 
-ifeq ($(USE_WINXP_FLAGS), yes)
-	DEFINES += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
-endif
-
 ifeq ($(USE_AESNI),yes)
 	NEEDED_CXXFLAGS += -maes
 	LDFLAGS += -maes
diff --git a/Win32/Win32NetState.cpp b/Win32/Win32NetState.cpp
index 095afe4554a..4ef768c8622 100644
--- a/Win32/Win32NetState.cpp
+++ b/Win32/Win32NetState.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2024, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
diff --git a/Win32/Win32NetState.h b/Win32/Win32NetState.h
index 5006daadaab..c1f47a24878 100644
--- a/Win32/Win32NetState.h
+++ b/Win32/Win32NetState.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2024, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
diff --git a/libi2pd/FS.cpp b/libi2pd/FS.cpp
index fdfd577efcd..a623a4ebb80 100644
--- a/libi2pd/FS.cpp
+++ b/libi2pd/FS.cpp
@@ -261,13 +261,13 @@ namespace fs {
 #else	*/	// TODO: wait until implemented
 		const auto sctp = std::chrono::time_point_cast<std::chrono::system_clock::duration>(
 		    t - decltype(t)::clock::now() + std::chrono::system_clock::now());
-/*#endif */	
-   		return std::chrono::system_clock::to_time_t(sctp);	
-#else		
+/*#endif */
+		return std::chrono::system_clock::to_time_t(sctp);
+#else
 		boost::system::error_code ec;
 		auto t = boost::filesystem::last_write_time (path, ec);
 		return ec ? 0 : t;
-#endif		
+#endif
 	}
 
 	bool Remove(const std::string & path) {
diff --git a/libi2pd/FS.h b/libi2pd/FS.h
index 8bf8101ec20..7af8f494623 100644
--- a/libi2pd/FS.h
+++ b/libi2pd/FS.h
@@ -16,7 +16,9 @@
 #include <functional>
 
 #ifndef STD_FILESYSTEM
-#	if (!TARGET_OS_SIMULATOR && __has_include(<filesystem>)) // supports std::filesystem
+#	if (_WIN32 && __GNUG__) // MinGW GCC somehow incorrectly converts paths
+#		define STD_FILESYSTEM 0
+#	elif (!TARGET_OS_SIMULATOR && __has_include(<filesystem>)) // supports std::filesystem
 #		define STD_FILESYSTEM 1
 #	else
 #		define STD_FILESYSTEM 0