diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake
index 390f54bd45..0d331896d6 100644
--- a/ports/nanogui/portfile.cmake
+++ b/ports/nanogui/portfile.cmake
@@ -1,14 +1,14 @@
-if (VCPKG_HOST_IS_WINDOWS)
-  set(USE_GLAD -DNANOGUI_USE_GLAD=ON)
-  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_HOST_IS_WINDOWS)
+    set(USE_GLAD -DNANOGUI_USE_GLAD=ON)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 else()
-  set(USE_GLAD -DNANOGUI_USE_GLAD=OFF)
+    set(USE_GLAD -DNANOGUI_USE_GLAD=OFF)
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wjakob/nanogui
-    REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 #Commits on Sep 23, 2019
+    REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 # Commits on Sep 23, 2019
     SHA512 36c93bf977862ced2df4030211e2b83625e60a11fc9fdb6c1f2996bb234758331d3f41a7fbafd25a5bca0239ed9bac9c93446a4a7fac4c5e6d7943af2be3e14a
     HEAD_REF master
     PATCHES
@@ -17,15 +17,18 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-FEATURES
-    "example"           NANOGUI_BUILD_EXAMPLE
+    FEATURES
+        "example" NANOGUI_BUILD_EXAMPLE
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
         -DNANOGUI_EIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3
         -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3
+        -DNANOGUI_BUILD_SHARED=${BUILD_SHARED}
         ${USE_GLAD}
 )
 
@@ -33,5 +36,4 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json
index a53f09f69b..cc8325a9a7 100644
--- a/ports/nanogui/vcpkg.json
+++ b/ports/nanogui/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nanogui",
   "version-date": "2019-09-23",
-  "port-version": 4,
+  "port-version": 5,
   "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.",
   "homepage": "https://github.com/wjakob/nanogui",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 2c8724b793..565b43960f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4898,7 +4898,7 @@
     },
     "nanogui": {
       "baseline": "2019-09-23",
-      "port-version": 4
+      "port-version": 5
     },
     "nanomsg": {
       "baseline": "1.1.5",
diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json
index 332617a169..a7117eac6b 100644
--- a/versions/n-/nanogui.json
+++ b/versions/n-/nanogui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba52e521c1d71e2e1c855913e9a1b437920a9fc9",
+      "version-date": "2019-09-23",
+      "port-version": 5
+    },
     {
       "git-tree": "7b0c7f8295a21f967bfd880956f6d51b98d26874",
       "version-date": "2019-09-23",