diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
index 2e1331819b..1b59d4d8a8 100644
--- a/ports/aubio/CMakeLists.txt
+++ b/ports/aubio/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 project(aubio C)
 
 option(WITH_DEPENDENCIES "Adds extra dependencies" ON)
+option(BUILD_TOOLS "Build and install tools" ON)
 
 add_definitions(
     -DHAVE_STDLIB_H=1
@@ -12,18 +13,23 @@ add_definitions(
     -DHAVE_STDARG_H=1
     -DHAVE_ERRNO_H=1
     -DHAVE_C99_VARARGS_MACROS=1
-
     -D_CRT_SECURE_NO_WARNINGS=1
 )
 
-set(CMAKE_DEBUG_POSTFIX d)
-
-option(BUILD_TOOLS "Build and install tools" ON)
+if(WITH_DEPENDENCIES)
+    add_definitions(
+        -DHAVE_SNDFILE=1
+        -DHAVE_WAVWRITE=1
+        -DHAVE_WAVREAD=1
+        -DHAVE_LIBAV=1
+        -DHAVE_SWRESAMPLE=1
+    )
+endif()
 
 set(TOOLS_INSTALLDIR "bin" CACHE STRING "Target directory for installed tools")
 
 if(WITH_DEPENDENCIES)
-    find_package(FFMPEG COMPONENTS avcodec avutil avdevice avfilter avformat swresample REQUIRED)
+    find_package(FFMPEG COMPONENTS avcodec avutil avformat swresample REQUIRED)
     find_package(BZip2 REQUIRED)
     find_package(LibLZMA REQUIRED)
     find_package(SndFile REQUIRED)
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
index 5d67f152ac..c1cab53794 100644
--- a/ports/aubio/portfile.cmake
+++ b/ports/aubio/portfile.cmake
@@ -13,11 +13,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
     tools WITH_DEPENDENCIES
-    tools HAVE_SNDFILE
-    tools HAVE_WAVWRITE
-    tools HAVE_WAVREAD
-    tools HAVE_LIBAV
-    tools HAVE_SWRESAMPLE
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json
index b7d04f4c47..ac34c872d6 100644
--- a/ports/aubio/vcpkg.json
+++ b/ports/aubio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aubio",
-  "version-string": "0.4.9",
-  "port-version": 4,
+  "version-semver": "0.4.9",
+  "port-version": 5,
   "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.",
   "homepage": "https://github.com/aubio/aubio",
   "default-features": [
@@ -12,7 +12,15 @@
       "description": "Build tools and add extra dependencies",
       "dependencies": [
         "bzip2",
-        "ffmpeg",
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "avformat",
+            "swresample"
+          ]
+        },
         "libflac",
         "liblzma",
         "libogg",
diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json
index 88fd28ab7d..7e9810d14f 100644
--- a/versions/a-/aubio.json
+++ b/versions/a-/aubio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "229c53eddabe48fa718f95c3dd3094a694770a19",
+      "version-semver": "0.4.9",
+      "port-version": 5
+    },
     {
       "git-tree": "a5fd622dc9d70a1f4cca1e6bc09829e1844b7e0f",
       "version-string": "0.4.9",
diff --git a/versions/baseline.json b/versions/baseline.json
index b346ec608d..7d671275c4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -202,7 +202,7 @@
     },
     "aubio": {
       "baseline": "0.4.9",
-      "port-version": 4
+      "port-version": 5
     },
     "audiofile": {
       "baseline": "1.0.7",