diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 1a1d5a46c..deb9be6cc 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -233,6 +233,7 @@ AUTHENTICODE_FILES= \
                     libgpgme-11.dll           \
                     libksba-8.dll             \
                     libnpth-0.dll             \
+                    libntbtls-0.dll           \
                     libsqlite3-0.dll          \
                     pinentry-w32.exe          \
                     scdaemon.exe	      \
@@ -498,9 +499,6 @@ speedo_pkg_libgcrypt_configure = --disable-static
 
 speedo_pkg_libksba_configure = --disable-static
 
-speedo_pkg_ntbtls_configure = --enable-static
-
-
 ifeq ($(STATIC),1)
 speedo_pkg_npth_configure += --disable-shared
 
@@ -513,9 +511,6 @@ speedo_pkg_libgcrypt_configure += --disable-shared
 speedo_pkg_libksba_configure += --disable-shared
 endif
 
-# For now we build ntbtls only static
-speedo_pkg_ntbtls_configure = --disable-shared
-
 ifeq ($(TARGETOS),w32)
 speedo_pkg_gnupg_configure = \
         --disable-g13 --enable-ntbtls --disable-tpm2d
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 674cb4d26..8b42e821f 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -858,6 +858,11 @@ Section "-sqlite" SEC_sqlite
   File bin/libsqlite3-0.dll
 SectionEnd
 
+Section "-ntbtls" SEC_ntbtls
+  SetOutPath "$INSTDIR\bin"
+  File bin/libntbtls-0.dll
+SectionEnd
+
 !ifdef WITH_GUI
 Section "-libiconv" SEC_libiconv
   SetOutPath "$INSTDIR\bin"
@@ -1442,6 +1447,10 @@ Section "-un.sqlite"
   Delete "$INSTDIR\bin\libsqlite3-0.dll"
 SectionEnd
 
+Section "-un.ntbtls"
+  Delete "$INSTDIR\bin\libntbtls-0.dll"
+SectionEnd
+
 Section "-un.gnupginst"
   # Delete standard stuff.
   Delete "$INSTDIR\README.txt"
diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs
index 48d105db3..82adb9599 100644
--- a/build-aux/speedo/w32/wixlib.wxs
+++ b/build-aux/speedo/w32/wixlib.wxs
@@ -118,6 +118,9 @@ and then manually edited:
       <Component Id="cmpC056F063A80E93157FDD8E5EFB2CE016" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="20439DF2-C028-43DD-9BC1-482FDE51C8C5">
         <File Id="filF97663792C6DE115203B57642F12933C" KeyPath="yes" Source="$(var.SourceDir)\bin\libsqlite3-0.dll"/>
       </Component>
+      <Component Id="cmpC056F063A80E93157FDD8E5EFB2CE017" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="304AEF03-D2EC-430E-96BF-34893AF88376">
+        <File Id="filF98663792C6DE115203B57642F12933E" KeyPath="yes" Source="$(var.SourceDir)\bin\libntbtls-0.dll"/>
+      </Component>
       <Component Id="cmp1EA054F1DCA27F5E05A6BB12C0FD5037" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="C4BB5B91-A126-4E9E-9E59-194CB722E8A5">
         <File Id="fil52E5309B19823ED3214CA9CA0F5E434D" KeyPath="yes" Source="$(var.SourceDir)\bin\pinentry-w32.exe" Name="pinentry-basic.exe"/>
       </Component>