diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb71a372..aa357290 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -164,6 +164,9 @@ if(WIN32)
 
   # vpncmgr
   add_subdirectory(vpncmgr)
+
+  # vpnsetup
+  add_subdirectory(vpnsetup)
 endif()
 
 if(UNIX)
diff --git a/src/vpnsetup/CMakeLists.txt b/src/vpnsetup/CMakeLists.txt
new file mode 100644
index 00000000..2e6b595c
--- /dev/null
+++ b/src/vpnsetup/CMakeLists.txt
@@ -0,0 +1,30 @@
+if(NOT WIN32)
+  message(FATAL_ERROR "VPN Setup is available only for Windows.")
+endif()
+
+set(COMPONENT_NAME "Setup")
+set(COMPONENT_INTERNAL_NAME "vpnsetup")
+
+add_executable(vpnsetup WIN32 vpnsetup.c vpnsetup.rc)
+
+get_filename_component(COMPONENT_FILE_NAME vpnsetup NAME)
+set(COMPONENT_FILE_NAME "${COMPONENT_FILE_NAME}.exe")
+
+configure_file("${TOP_DIRECTORY}/src/BuildFiles/VerScript/ver.rc" "${CMAKE_CURRENT_BINARY_DIR}/ver.rc")
+target_sources(vpnsetup PRIVATE "vpnsetup.rc" "${CMAKE_CURRENT_BINARY_DIR}/ver.rc")
+
+if(${COMPILER_ARCHITECTURE} STREQUAL "x64")
+  target_sources(vpnsetup PRIVATE "${TOP_DIRECTORY}/src/BuildFiles/Manifests/x64_user.manifest")
+else()
+  target_sources(vpnsetup PRIVATE "${TOP_DIRECTORY}/src/BuildFiles/Manifests/x86_user.manifest")
+endif()
+
+set_target_properties(vpnsetup
+  PROPERTIES
+  ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
+  LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
+  RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
+  PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
+)
+
+target_link_libraries(vpnsetup cedar mayaqua)