diff --git a/debian/rpiboot.install b/debian/rpiboot.install
index ac821fe..3c573c3 100644
--- a/debian/rpiboot.install
+++ b/debian/rpiboot.install
@@ -7,6 +7,14 @@ msd/*.bin usr/share/rpiboot/msd/
 recovery/*.bin usr/share/rpiboot/recovery/
 recovery/*.sig usr/share/rpiboot/recovery/
 recovery/*.txt usr/share/rpiboot/recovery/
+rpi-imager-embedded/*.bin usr/share/rpiboot/rpi-imager-embedded/
+rpi-imager-embedded/*.img usr/share/rpiboot/rpi-imager-embedded/
+rpi-imager-embedded/*.md usr/share/rpiboot/rpi-imager-embedded/
+rpi-imager-embedded/*.txt usr/share/rpiboot/rpi-imager-embedded/
+mass-storage-gadget/*.bin usr/share/rpiboot/mass-storage-gadget/
+mass-storage-gadget/*.img usr/share/rpiboot/mass-storage-gadget/
+mass-storage-gadget/*.md usr/share/rpiboot/mass-storage-gadget/
+mass-storage-gadget/*.txt usr/share/rpiboot/mass-storage-gadget/
 secure-boot-recovery/*.txt usr/share/rpiboot/secure-boot-recovery/
 secure-boot-recovery/*.conf usr/share/rpiboot/secure-boot-recovery/
 secure-boot-recovery/*.md usr/share/rpiboot/secure-boot-recovery/
@@ -14,5 +22,10 @@ secure-boot-recovery/*.bin usr/share/rpiboot/secure-boot-recovery/
 secure-boot-msd/*.bin usr/share/rpiboot/secure-boot-msd/
 secure-boot-msd/*.img usr/share/rpiboot/secure-boot-msd/
 secure-boot-msd/*.md usr/share/rpiboot/secure-boot-msd/
+secure-boot-msd/*.txt usr/share/rpiboot/secure-boot-msd/
+secure-boot-example/*.bin usr/share/rpiboot/secure-boot-example/
+secure-boot-example/*.img usr/share/rpiboot/secure-boot-example/
+secure-boot-example/*.md usr/share/rpiboot/secure-boot-example/
+secure-boot-example/*.txt usr/share/rpiboot/secure-boot-example/
 tools/* usr/share/rpiboot/tools/
 debian/70-rpiboot.rules /lib/udev/rules.d
diff --git a/win32/install_script.nsi b/win32/install_script.nsi
index 93dee77..717a3f4 100644
--- a/win32/install_script.nsi
+++ b/win32/install_script.nsi
@@ -92,14 +92,33 @@ FunctionEnd
 Section "Raspberry Pi USB Boot" Sec_rpiboot
 
   SetOutPath "$INSTDIR"
-
   File /r redist
-  File /r ..\msd
-  File /r ..\recovery
-  File /r ..\secure-boot-recovery
-  File /r ..\secure-boot-msd
-  File /r ..\tools
+  
+  SetOutPath "$INSTDIR\msd"
+  File /r ..\msd\*.*
+  
+  SetOutPath "$INSTDIR\recovery"
+  File /r ..\recovery\*.*
+  
+  SetOutPath "$INSTDIR\mass-storage-gadget"
+  File /r ..\mass-storage-gadget\*.*
+  
+  SetOutPath "$INSTDIR\rpi-imager-embedded"
+  File /r ..\rpi-imager-embedded\*.*
+  
+  SetOutPath "$INSTDIR\secure-boot-example"
+  File /r ..\secure-boot-example\*.*
+  
+  SetOutPath "$INSTDIR\secure-boot-msd"
+  File /r ..\secure-boot-msd\*.*
+  
+  SetOutPath "$INSTDIR\secure-boot-recovery"
+  File /r ..\secure-boot-recovery\*.*
+  
+  SetOutPath "$INSTDIR\tools"
+  File /r ..\tools\*.*
 
+  SetOutPath "$INSTDIR"
   DetailPrint "Installing BCM2708 driver..."
   ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2763 -t 0' $0 
   DetailPrint "Driver install returned $0"
@@ -111,7 +130,7 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot
   DetailPrint "Installing BCM2711 driver..."
   ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2711 -t 0' $0 
   DetailPrint "Driver install returned $0"
-
+  
   File cyggcc_s-1.dll
   File cygusb-1.0.dll
   File cygwin1.dll
@@ -146,8 +165,14 @@ SectionEnd
 Section "Uninstall"
 
   RmDir /r /REBOOTOK $INSTDIR\redist
+  RmDir /r /REBOOTOK $INSTDIR\mass-storage-gadget
   RmDir /r /REBOOTOK $INSTDIR\msd
   RmDir /r /REBOOTOK $INSTDIR\recovery
+  RmDir /r /REBOOTOK $INSTDIR\rpi-imager-embedded
+  RmDir /r /REBOOTOK $INSTDIR\secure-boot-example
+  RmDir /r /REBOOTOK $INSTDIR\secure-boot-msd
+  RmDir /r /REBOOTOK $INSTDIR\secure-boot-recovery
+  RmDir /r /REBOOTOK $INSTDIR\tools
   RmDir /r /REBOOTOK $INSTDIR\usb_driver
 
   Delete $INSTDIR\Uninstall.exe