diff --git a/ports/libosmscout/msvc-arm.diff b/ports/libosmscout/msvc-arm.diff
new file mode 100644
index 0000000000..984fe603a3
--- /dev/null
+++ b/ports/libosmscout/msvc-arm.diff
@@ -0,0 +1,21 @@
+diff --git a/cmake/features.cmake b/cmake/features.cmake
+index 8b5563e..a6f0ae8 100644
+--- a/cmake/features.cmake
++++ b/cmake/features.cmake
+@@ -57,6 +57,16 @@ if(NOT MSVC)
+   if(HAVE_SSE2)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+   endif()
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
++  set(HAVE_ALTIVEC OFF)
++  set(HAVE_AVX OFF)
++  set(HAVE_MMX OFF)
++  set(HAVE_SSE OFF)
++  set(HAVE_SSE2 OFF)
++  set(HAVE_SSE3 OFF)
++  set(HAVE_SSE4_1 OFF)
++  set(HAVE_SSE4_2 OFF)
++  set(HAVE_SSSE3 OFF)
+ else()
+   set(HAVE_ALTIVEC OFF)
+   set(HAVE_AVX ON)
diff --git a/ports/libosmscout/msvc-static.diff b/ports/libosmscout/msvc-static.diff
new file mode 100644
index 0000000000..8286b2a5c4
--- /dev/null
+++ b/ports/libosmscout/msvc-static.diff
@@ -0,0 +1,12 @@
+diff --git a/cmake/ProjectConfig.cmake b/cmake/ProjectConfig.cmake
+index fb15465..107560f 100644
+--- a/cmake/ProjectConfig.cmake
++++ b/cmake/ProjectConfig.cmake
+@@ -128,7 +128,6 @@ macro(osmscout_library_project)
+ 		if(BUILD_SHARED_LIBS)
+ 			install(FILES $<TARGET_PDB_FILE:${_name}> DESTINATION ${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS Debug)
+ 		else()
+-			install(FILES $<TARGET_PDB_FILE:${_name}> DESTINATION ${CMAKE_INSTALL_PREFIX}/lib CONFIGURATIONS Debug)
+ 		endif()
+ 	endif()
+ endmacro(osmscout_library_project)
diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake
index b1b65ab84e..109476774e 100644
--- a/ports/libosmscout/portfile.cmake
+++ b/ports/libosmscout/portfile.cmake
@@ -7,23 +7,25 @@ vcpkg_from_github(
     PATCHES
         protobuf-linkage.patch
         fix-libxml2.patch
+        msvc-arm.diff
+        msvc-static.diff
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
-    cairo   OSMSCOUT_BUILD_MAP_CAIRO
-    directx OSMSCOUT_BUILD_MAP_DIRECTX
-    gdi     OSMSCOUT_BUILD_MAP_GDI
-    svg     OSMSCOUT_BUILD_MAP_SVG
-    qt5      OSMSCOUT_BUILD_MAP_QT
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        cairo   OSMSCOUT_BUILD_MAP_CAIRO
+        directx OSMSCOUT_BUILD_MAP_DIRECTX
+        gdi     OSMSCOUT_BUILD_MAP_GDI
+        qt5     OSMSCOUT_BUILD_MAP_QT
+        svg     OSMSCOUT_BUILD_MAP_SVG
+        tools   OSMSCOUT_BUILD_TOOL_IMPORT
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    WINDOWS_USE_MSBUILD
     OPTIONS
         -DOSMSCOUT_BUILD_DEMOS=OFF
         -DOSMSCOUT_BUILD_TOOL_DUMPDATA=OFF
-        -DOSMSCOUT_BUILD_TOOL_IMPORT=ON
         -DOSMSCOUT_BUILD_TOOL_OSMSCOUT2=OFF
         -DOSMSCOUT_BUILD_TOOL_OSMSCOUTOPENGL=OFF
         -DOSMSCOUT_BUILD_TOOL_PUBLICTRANSPORTMAP=OFF
@@ -31,15 +33,18 @@ vcpkg_cmake_configure(
         -DOSMSCOUT_BUILD_EXTERN_MATLAB=OFF
         -DOSMSCOUT_BUILD_TESTS=OFF
         ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DOSMSCOUT_BUILD_TOOL_IMPORT=OFF
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN)
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libosmscout)
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES BasemapImport Import AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/BasemapImport.exe")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/BasemapImport.exe")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/libosmscout/vcpkg.json b/ports/libosmscout/vcpkg.json
index 39a44217d4..d9a4b6044e 100644
--- a/ports/libosmscout/vcpkg.json
+++ b/ports/libosmscout/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "name": "libosmscout",
   "version": "1.1.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.",
   "homepage": "https://libosmscout.sourceforge.net/",
   "documentation": "https://libosmscout.sourceforge.net/documentation/",
-  "supports": "!uwp & !(windows & arm) & !android & !(windows & static) & !wasm32 & !emscripten",
+  "supports": "!uwp",
   "dependencies": [
     "libiconv",
     "liblzma",
-    "libxml2",
+    {
+      "name": "libxml2",
+      "default-features": false
+    },
     "protobuf",
     {
       "name": "vcpkg-cmake",
@@ -25,9 +28,18 @@
     "cairo": {
       "description": "Cairo backend renderer",
       "dependencies": [
-        "cairo",
-        "freetype",
-        "harfbuzz",
+        {
+          "name": "cairo",
+          "default-features": false
+        },
+        {
+          "name": "freetype",
+          "default-features": false
+        },
+        {
+          "name": "harfbuzz",
+          "default-features": false
+        },
         "libpng",
         "pango"
       ]
@@ -50,10 +62,19 @@
     "svg": {
       "description": "SVG backend renderer",
       "dependencies": [
-        "freetype",
-        "harfbuzz",
+        {
+          "name": "freetype",
+          "default-features": false
+        },
+        {
+          "name": "harfbuzz",
+          "default-features": false
+        },
         "pango"
       ]
+    },
+    "tools": {
+      "description": "Install tools"
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index cfe7cd89be..43dd997153 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5202,7 +5202,7 @@
     },
     "libosmscout": {
       "baseline": "1.1.1",
-      "port-version": 7
+      "port-version": 8
     },
     "libp7-baical": {
       "baseline": "replaced",
diff --git a/versions/l-/libosmscout.json b/versions/l-/libosmscout.json
index 497af2c9b6..962f3d96c4 100644
--- a/versions/l-/libosmscout.json
+++ b/versions/l-/libosmscout.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c7cb6b96a90b374c4b6613385dcac6fe3fcc61eb",
+      "version": "1.1.1",
+      "port-version": 8
+    },
     {
       "git-tree": "4006b3fc78252ee15866ddca75a568a4b8530ee2",
       "version": "1.1.1",