diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 4001e319..eda0b610 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -40,6 +40,41 @@ jobs:
         name: i2pd-${{ matrix.arch_short }}.exe
         path: i2pd.exe
 
+  build-cmake:
+    name: Building using ${{ matrix.arch }} toolchain using CMake
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: UCRT64, arch: ucrt-x86_64, arch_short: x64-ucrt },
+          { msystem: CLANG64, arch: clang-x86_64, arch_short: x64-clang },
+          { msystem: MINGW64, arch: x86_64, arch_short: x64 },
+          { msystem: MINGW32, arch: i686, arch_short: x86 }
+        ]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: base-devel git mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-boost mingw-w64-${{ matrix.arch }}-openssl mingw-w64-${{ matrix.arch }}-miniupnpc
+        update: true
+    - name: Build application
+      run: |
+        cd build
+        cmake -DWITH_GIT_VERSION=ON -DWITH_STATIC=ON -DWITH_UPNP=ON -DCMAKE_BUILD_TYPE=Release .
+        cmake --build .
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: i2pd-cmake-${{ matrix.arch_short }}.exe
+        path: i2pd.exe
+
   build-xp:
     name: Building for Windows XP
     runs-on: windows-latest
diff --git a/Makefile b/Makefile
index 520a56ba..0861ec0b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,13 +71,15 @@ else # not supported
 	$(error Not supported platform)
 endif
 
+INCFLAGS += -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR) -I$(LANG_SRC_DIR)
+DEFINES += -DOPENSSL_SUPPRESS_DEPRECATED
+NEEDED_CXXFLAGS += -MMD -MP
+
 ifeq ($(USE_GIT_VERSION),yes)
 	GIT_VERSION := $(shell git describe --tags)
-	NEEDED_CXXFLAGS += -DGITVER=\"$(GIT_VERSION)\"
+	DEFINES += -DGITVER=$(GIT_VERSION)
 endif
 
-NEEDED_CXXFLAGS += -MMD -MP -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR) -I$(LANG_SRC_DIR) -DOPENSSL_SUPPRESS_DEPRECATED
-
 LIB_OBJS        += $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
 LIB_CLIENT_OBJS += $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
 LANG_OBJS       += $(patsubst %.cpp,obj/%.o,$(LANG_SRC))
@@ -110,13 +112,13 @@ wrapper: api_client $(SHLIB_WRAP) $(ARLIB_WRAP)
 ## custom FLAGS to work at build-time.
 
 obj/%.o: %.cpp | mk_obj_dir
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(DEFINES) $(INCFLAGS) -c -o $@ $<
 
 # '-' is 'ignore if missing' on first run
 -include $(DEPS)
 
 $(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT) $(ARLIB_LANG)
-	$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
+	$(CXX) -o $@ $(DEFINES) $(LDFLAGS) $^ $(LDLIBS)
 
 $(SHLIB): $(LIB_OBJS)
 ifneq ($(USE_STATIC),yes)
diff --git a/Makefile.bsd b/Makefile.bsd
index 39e5651a..00543193 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -6,7 +6,8 @@ CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misl
 ## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
 ## -std=c++11. If you want to remove this variable please do so in a way that allows setting
 ## custom FLAGS to work at build-time.
-NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
+NEEDED_CXXFLAGS = -std=c++11
+DEFINES = -D_GLIBCXX_USE_NANOSLEEP=1
 INCFLAGS = -I/usr/include/ -I/usr/local/include/
 LDFLAGS = ${LD_DEBUG} -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
diff --git a/Makefile.linux b/Makefile.linux
index d01f2b73..6c7a4619 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -58,12 +58,13 @@ endif
 
 # UPNP Support (miniupnpc 1.5 and higher)
 ifeq ($(USE_UPNP),yes)
-	NEEDED_CXXFLAGS += -DUSE_UPNP
+	DEFINES += -DUSE_UPNP
 endif
 
 ifeq ($(USE_AESNI),yes)
 ifneq (, $(findstring i386, $(SYS))$(findstring i686, $(SYS))$(findstring x86_64, $(SYS))) # only x86-based CPU supports that
-	NEEDED_CXXFLAGS += -D__AES__ -maes
+	NEEDED_CXXFLAGS += -maes
+	DEFINES += -D__AES__
 endif
 endif
 
diff --git a/Makefile.mingw b/Makefile.mingw
index a1a861e6..6cd19080 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -4,17 +4,18 @@ USE_WIN32_APP := yes
 WINDRES = windres
 
 CXXFLAGS := $(CXX_DEBUG) -fPIC -msse
-INCFLAGS = -I$(DAEMON_SRC_DIR) -IWin32
+INCFLAGS := -I$(DAEMON_SRC_DIR) -IWin32
 LDFLAGS := ${LD_DEBUG} -static
 
-NEEDED_CXXFLAGS += -std=c++17 -DWIN32_LEAN_AND_MEAN
+NEEDED_CXXFLAGS += -std=c++17
+DEFINES += -DWIN32_LEAN_AND_MEAN
 
 # Boost libraries suffix
 BOOST_SUFFIX = -mt
 
 # UPNP Support
 ifeq ($(USE_UPNP),yes)
-	CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
+	DEFINES += -DUSE_UPNP -DMINIUPNP_STATICLIB
 	LDLIBS = -lminiupnpc
 endif
 
@@ -35,18 +36,19 @@ LDLIBS += \
 	-lpthread
 
 ifeq ($(USE_WIN32_APP), yes)
-	NEEDED_CXXFLAGS += -DWIN32_APP
+	DEFINES += -DWIN32_APP
 	LDFLAGS += -mwindows
 	DAEMON_RC += Win32/Resource.rc
 	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
 endif
 
 ifeq ($(USE_WINXP_FLAGS), yes)
-	NEEDED_CXXFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
+	DEFINES += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
 endif
 
 ifeq ($(USE_AESNI),yes)
-	NEEDED_CXXFLAGS += -D__AES__ -maes
+	NEEDED_CXXFLAGS += -maes
+	DEFINES += -D__AES__
 endif
 
 ifeq ($(USE_ASLR),yes)
@@ -54,4 +56,4 @@ ifeq ($(USE_ASLR),yes)
 endif
 
 obj/%.o : %.rc | mk_obj_dir
-	$(WINDRES) -i $< -o $@
+	$(WINDRES) $(DEFINES) $(INCFLAGS) --preprocessor-arg=-MMD --preprocessor-arg=-MP --preprocessor-arg=-MF$@.d -i $< -o $@
diff --git a/Makefile.osx b/Makefile.osx
index 2e52585e..b91008d6 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -1,6 +1,7 @@
 CXX = clang++
-CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++11 -DMAC_OSX
+CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++11
 INCFLAGS = -I/usr/local/include
+DEFINES := -DMAC_OSX
 LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 LDFLAGS += -Wl,-dead_strip
 LDFLAGS += -Wl,-dead_strip_dylibs
@@ -14,7 +15,7 @@ endif
 
 ifeq ($(USE_UPNP),yes)
 	LDFLAGS += -ldl
-	CXXFLAGS += -DUSE_UPNP
+	DEFINES += -DUSE_UPNP
 	ifeq ($(USE_STATIC),yes)
 		LDLIBS += /usr/local/lib/libminiupnpc.a
 	else
@@ -23,7 +24,8 @@ ifeq ($(USE_UPNP),yes)
 endif
 
 ifeq ($(USE_AESNI),yes)
-	CXXFLAGS += -D__AES__ -maes
+	CXXFLAGS += -maes
+	DEFINES += -D__AES__
 else
 	CXXFLAGS += -msse
 endif
diff --git a/Win32/Resource.rc b/Win32/Resource.rc
index 5d394d1a..c9266b08 100644
--- a/Win32/Resource.rc
+++ b/Win32/Resource.rc
@@ -1,36 +1,36 @@
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-#include "winres.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-#endif		// APSTUDIO_INVOKED
-
-MAINICON ICON "mask.ico"
-#endif		// English (United States) resources
-
-#ifndef APSTUDIO_INVOKED
-#include "Resource.rc2"
-#endif		// not APSTUDIO_INVOKED
-
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+#endif		// APSTUDIO_INVOKED
+
+MAINICON ICON "mask.ico"
+#endif		// English (United States) resources
+
+#ifndef APSTUDIO_INVOKED
+#include "Resource.rc2"
+#endif		// not APSTUDIO_INVOKED
+
diff --git a/Win32/Resource.rc2 b/Win32/Resource.rc2
index 873d6402..32744584 100644
--- a/Win32/Resource.rc2
+++ b/Win32/Resource.rc2
@@ -2,7 +2,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "../libi2pd/version.h"
+#include "version.h"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION I2PD_VERSION_MAJOR,I2PD_VERSION_MINOR,I2PD_VERSION_MICRO,I2PD_VERSION_PATCH
@@ -25,7 +25,7 @@ BEGIN
             VALUE "FileDescription", "C++ I2P daemon"
             VALUE "FileVersion", I2PD_VERSION
             VALUE "InternalName", CODENAME
-            VALUE "LegalCopyright", "Copyright (C) 2013-2022, The PurpleI2P Project"
+            VALUE "LegalCopyright", "Copyright (C) 2013-2023, The PurpleI2P Project"
             VALUE "OriginalFilename", "i2pd"
             VALUE "ProductName", "Purple I2P"
             VALUE "ProductVersion", I2P_VERSION
diff --git a/build/.gitignore b/build/.gitignore
index 7689cc88..d51958d6 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -2,7 +2,12 @@
 /CMakeFiles/
 /Testing/
 /tests/
+/.ninja_*
+/arch.c
+/build.ninja
 /i2pd
+/i2pd.exe
+/i2pd.exe.debug
 /libi2pd.a
 /libi2pdclient.a
 /libi2pdlang.a
@@ -12,7 +17,7 @@
 /CPackSourceConfig.cmake
 /CTestTestfile.cmake
 /install_manifest.txt
-/arch.c
+/Makefile
 # windows build script
 i2pd*.zip
 build*.log
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index f6f52001..fc0d5a46 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -1,14 +1,32 @@
 cmake_minimum_required(VERSION 3.7)
-cmake_policy(VERSION 3.7)
-project("i2pd")
+
+if(${CMAKE_VERSION} VERSION_LESS 3.22)
+  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+else()
+  cmake_policy(VERSION 3.22)
+endif()
 
 # for debugging
 #set(CMAKE_VERBOSE_MAKEFILE on)
 
-# Win32 build with cmake is not supported
-if(WIN32 OR MSVC OR MSYS OR MINGW)
-  message(SEND_ERROR "cmake build for windows is not supported. Please use MSYS2 with makefiles in project root.")
-endif()
+# paths
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
+set(CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
+
+set(LIBI2PD_SRC_DIR ${CMAKE_SOURCE_DIR}/libi2pd)
+set(LIBI2PD_CLIENT_SRC_DIR ${CMAKE_SOURCE_DIR}/libi2pd_client)
+set(LANG_SRC_DIR ${CMAKE_SOURCE_DIR}/i18n)
+set(DAEMON_SRC_DIR ${CMAKE_SOURCE_DIR}/daemon)
+
+include(Version)
+set_version("${LIBI2PD_SRC_DIR}/version.h" PROJECT_VERSION)
+
+project(
+  i2pd
+  VERSION ${PROJECT_VERSION}
+  HOMEPAGE_URL "https://i2pd.website/"
+  LANGUAGES CXX
+)
 
 # configurable options
 option(WITH_AESNI           "Use AES-NI instructions set"             ON)
@@ -26,27 +44,16 @@ IF(BUILD_TESTING)
   enable_testing()
 ENDIF()
 
-# paths
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
-set(CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
-
 # Handle paths nicely
 include(GNUInstallDirs)
 
-# architecture
+# Architecture
 include(TargetArch)
 target_architecture(ARCHITECTURE)
 
-set(LIBI2PD_SRC_DIR ../libi2pd)
-set(LIBI2PD_CLIENT_SRC_DIR ../libi2pd_client)
-set(LANG_SRC_DIR ../i18n)
-set(DAEMON_SRC_DIR ../daemon)
+include(CheckAtomic)
 
 include_directories(${LIBI2PD_SRC_DIR})
-include_directories(${LIBI2PD_CLIENT_SRC_DIR})
-include_directories(${LANG_SRC_DIR})
-include_directories(${DAEMON_SRC_DIR})
-
 FILE(GLOB LIBI2PD_SRC ${LIBI2PD_SRC_DIR}/*.cpp)
 add_library(libi2pd ${LIBI2PD_SRC})
 set_target_properties(libi2pd PROPERTIES PREFIX "")
@@ -57,11 +64,9 @@ if(WITH_LIBRARY)
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     COMPONENT Libraries)
-# TODO Make libi2pd available to 3rd party projects via CMake as imported target
-# FIXME This pulls stdafx
-# install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
+include_directories(${LIBI2PD_CLIENT_SRC_DIR})
 FILE(GLOB CLIENT_SRC ${LIBI2PD_CLIENT_SRC_DIR}/*.cpp)
 add_library(libi2pdclient ${CLIENT_SRC})
 set_target_properties(libi2pdclient PROPERTIES PREFIX "")
@@ -74,6 +79,7 @@ if(WITH_LIBRARY)
     COMPONENT Libraries)
 endif()
 
+include_directories(${LANG_SRC_DIR})
 FILE(GLOB LANG_SRC ${LANG_SRC_DIR}/*.cpp)
 add_library(libi2pdlang ${LANG_SRC})
 set_target_properties(libi2pdlang PROPERTIES PREFIX "")
@@ -86,6 +92,8 @@ if(WITH_LIBRARY)
     COMPONENT Libraries)
 endif()
 
+include_directories(${DAEMON_SRC_DIR})
+
 set(DAEMON_SRC
   "${DAEMON_SRC_DIR}/Daemon.cpp"
   "${DAEMON_SRC_DIR}/HTTPServer.cpp"
@@ -95,6 +103,22 @@ set(DAEMON_SRC
   "${DAEMON_SRC_DIR}/UPnP.cpp"
 )
 
+if(WIN32)
+  set(WIN32_SRC_DIR ${CMAKE_SOURCE_DIR}/Win32)
+  include_directories(${WIN32_SRC_DIR})
+
+  list(APPEND DAEMON_SRC
+    "${WIN32_SRC_DIR}/DaemonWin32.cpp"
+    "${WIN32_SRC_DIR}/Win32App.cpp"
+    "${WIN32_SRC_DIR}/Win32Service.cpp"
+    "${WIN32_SRC_DIR}/Win32NetState.cpp"
+  )
+
+  file(GLOB WIN32_RC ${WIN32_SRC_DIR}/*.rc)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_APP -DWIN32_LEAN_AND_MEAN")
+
+endif()
+
 if(WITH_UPNP)
   add_definitions(-DUSE_UPNP)
 endif()
@@ -102,14 +126,14 @@ endif()
 if(WITH_GIT_VERSION)
   include(GetGitRevisionDescription)
   git_describe(GIT_VERSION)
-  add_definitions(-DGITVER="${GIT_VERSION}")
+  add_definitions(-DGITVER=${GIT_VERSION})
 endif()
 
 if(APPLE)
   add_definitions(-DMAC_OSX)
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter -Wno-uninitialized")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pedantic")
 # TODO: The following is incompatible with static build and enabled hardening for OpenWRT.
 # Multiple definitions of __stack_chk_fail(libssp & libc)
@@ -118,8 +142,10 @@ set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections") # -flto is added from
 
 # check for c++17 & c++11 support
 include(CheckCXXCompilerFlag)
+
 CHECK_CXX_COMPILER_FLAG("-std=c++17" CXX17_SUPPORTED)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX11_SUPPORTED)
+
 if(CXX17_SUPPORTED)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 elseif(CXX11_SUPPORTED)
@@ -188,10 +214,23 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 if(WITH_STATIC)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+
   set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
+  set(Boost_USE_STATIC_RUNTIME OFF)
+
   set(OPENSSL_USE_STATIC_LIBS ON)
+
+  set(ZLIB_USE_STATIC_LIBS ON)
+  set(ZLIB_NAMES libz zlibstatic zlibstat zlib z)
+
+  if(WITH_UPNP)
+    set(MINIUPNPC_USE_STATIC_LIBS ON)
+    add_definitions(-DMINIUPNP_STATICLIB)
+  endif()
+
   set(BUILD_SHARED_LIBS OFF)
+
   if(${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
     # set(CMAKE_THREAD_LIBS_INIT "gcc_eh -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
@@ -236,8 +275,6 @@ endif()
 # load includes
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
-include(CheckAtomic)
-
 # show summary
 message(STATUS "---------------------------------------")
 message(STATUS "Build type         : ${CMAKE_BUILD_TYPE}")
@@ -259,7 +296,15 @@ message(STATUS "  THREADSANITIZER  : ${WITH_THREADSANITIZER}")
 message(STATUS "---------------------------------------")
 
 if(WITH_BINARY)
-  add_executable("${PROJECT_NAME}" ${DAEMON_SRC})
+  if(WIN32)
+    add_executable("${PROJECT_NAME}" WIN32 ${DAEMON_SRC} ${WIN32_RC})
+  else()
+    add_executable("${PROJECT_NAME}" ${DAEMON_SRC})
+  endif()
+
+  if (WIN32)
+    set(MINGW_EXTRA "wsock32" "ws2_32" "iphlpapi")
+  endif ()
 
   if(WITH_STATIC)
     set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static")
@@ -279,7 +324,7 @@ if(WITH_BINARY)
     set(DL_LIB ${CMAKE_DL_LIBS})
   endif()
 
-  target_link_libraries("${PROJECT_NAME}" libi2pd libi2pdclient libi2pdlang ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto ${MINIUPNPC_LIBRARY} ZLIB::ZLIB Threads::Threads ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
+  target_link_libraries("${PROJECT_NAME}" libi2pd libi2pdclient libi2pdlang ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto ${MINIUPNPC_LIBRARY} ZLIB::ZLIB Threads::Threads ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
 
   install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
   set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
diff --git a/build/cmake_modules/Version.cmake b/build/cmake_modules/Version.cmake
new file mode 100644
index 00000000..cb9551db
--- /dev/null
+++ b/build/cmake_modules/Version.cmake
@@ -0,0 +1,16 @@
+# read version
+
+function(set_version version_file output_var)
+    file(READ "${version_file}" version_data)
+
+    string(REGEX MATCH "I2PD_VERSION_MAJOR ([0-9]*)" _ ${version_data})
+    set(version_major ${CMAKE_MATCH_1})
+
+    string(REGEX MATCH "I2PD_VERSION_MINOR ([0-9]*)" _ ${version_data})
+    set(version_minor ${CMAKE_MATCH_1})
+
+    string(REGEX MATCH "I2PD_VERSION_MICRO ([0-9]*)" _ ${version_data})
+    set(version_micro ${CMAKE_MATCH_1})
+
+    set(${output_var} "${version_major}.${version_minor}.${version_micro}" PARENT_SCOPE)
+endfunction()
diff --git a/libi2pd/version.h b/libi2pd/version.h
index b7de21a8..8d91c5c8 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -11,7 +11,9 @@
 
 #define CODENAME "Purple"
 
+#define XSTRINGIZE(x) STRINGIZE(x)
 #define STRINGIZE(x) #x
+
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
 #define MAKE_VERSION_NUMBER(a,b,c) ((a*100+b)*100+c)
 
@@ -20,7 +22,7 @@
 #define I2PD_VERSION_MICRO 1
 #define I2PD_VERSION_PATCH 0
 #ifdef GITVER
-	#define I2PD_VERSION GITVER
+	#define I2PD_VERSION XSTRINGIZE(GITVER)
 #else
 	#define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
 #endif