diff --git a/CMakeLists.txt b/CMakeLists.txt
index a29e0bdd7..e1f6fc47e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,18 @@ cmake_minimum_required(VERSION 3.16)
 cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0079 NEW)
 
-if (QT)
+if(QT)
     list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui")
 endif()
 
+if(SLIRP_EXTERNAL)
+    list(APPEND VCPKG_MANIFEST_FEATURES "slirp")
+endif()
+
+if(MUNT_EXTERNAL)
+    list(APPEND VCPKG_MANIFEST_FEATURES "munt")
+endif()
+
 project(86Box
     VERSION 3.2
     DESCRIPTION "Emulator of x86-based systems"
diff --git a/cmake/flags-gcc-aarch64.cmake b/cmake/flags-gcc-aarch64.cmake
index 146a869fc..2de0cc053 100644
--- a/cmake/flags-gcc-aarch64.cmake
+++ b/cmake/flags-gcc-aarch64.cmake
@@ -14,7 +14,7 @@
 #           Copyright 2021 David Hrdlička.
 #
 
-string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv8-a -mfloat-abi=hard")
-string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv8-a -mfloat-abi=hard")
+string(APPEND CMAKE_C_FLAGS_INIT    " -march=armv8-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
+string(APPEND CMAKE_CXX_FLAGS_INIT  " -march=armv8-a -mfloat-abi=hard ${CMAKE_C_FLAGS_INIT}")
 
 include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
\ No newline at end of file
diff --git a/vcpkg.json b/vcpkg.json
index f4e78d8e7..85295f1cf 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -18,6 +18,18 @@
 				"qt5-base",
 				"qt5-translations"
 			]
+		},
+		"munt": {
+			"description": "Roland MT-32 emulation",
+			"dependencies": [
+				"libmt32emu"
+			]
+		},
+		"slirp": {
+			"description": "Slirp network support",
+			"dependencies": [
+				"libslirp"
+			]
 		}
 	}
 }