diff --git a/mass-storage-gadget/bootcode4.bin b/bootcode4.bin
index b16eb3d..b67f0c1 100644
--- a/mass-storage-gadget/bootcode4.bin
+++ b/bootcode4.bin
diff --git a/debian/rpiboot.install b/debian/rpiboot.install
index 4a749b9..44720f8 100644
--- a/debian/rpiboot.install
+++ b/debian/rpiboot.install
@@ -1,10 +1,8 @@
 rpiboot usr/bin
-eeprom-erase/*.txt usr/share/rpiboot/eeprom-erase
-eeprom-erase/*.md usr/share/rpiboot/eeprom-erase
-eeprom-erase/*.bin usr/share/rpiboot/eeprom-erase
 msd/*.elf usr/share/rpiboot/msd/
 msd/*.bin usr/share/rpiboot/msd/
 recovery usr/share/rpiboot/
+eeprom-erase usr/share/rpiboot
 rpi-imager-embedded usr/share/rpiboot/
 mass-storage-gadget usr/share/rpiboot/
 secure-boot-recovery usr/share/rpiboot/
@@ -12,3 +10,5 @@ secure-boot-msd usr/share/rpiboot/
 secure-boot-example usr/share/rpiboot/
 tools usr/share/rpiboot/
 debian/70-rpiboot.rules /lib/udev/rules.d
+recovery.bin
+bootcode4.bin
diff --git a/eeprom-erase/bootcode4.bin b/eeprom-erase/bootcode4.bin
new file mode 120000
index 0000000..834c703
--- /dev/null
+++ b/eeprom-erase/bootcode4.bin
@@ -0,0 +1 @@
+../recovery.bin
\ No newline at end of file
diff --git a/mass-storage-gadget/bootcode4.bin b/mass-storage-gadget/bootcode4.bin
new file mode 120000
index 0000000..1792f20
--- /dev/null
+++ b/mass-storage-gadget/bootcode4.bin
@@ -0,0 +1 @@
+../bootcode4.bin
\ No newline at end of file
diff --git a/msd/bootcode4.bin b/msd/bootcode4.bin
new file mode 120000
index 0000000..1792f20
--- /dev/null
+++ b/msd/bootcode4.bin
@@ -0,0 +1 @@
+../bootcode4.bin
\ No newline at end of file
diff --git a/msd/bootcode4.bin b/msd/bootcode4.bin
deleted file mode 100644
index b16eb3d..0000000
--- a/msd/bootcode4.bin
+++ /dev/null
diff --git a/eeprom-erase/bootcode4.bin b/recovery.bin
index e7f1238..2f3e542 100644
--- a/eeprom-erase/bootcode4.bin
+++ b/recovery.bin
diff --git a/recovery/bootcode4.bin b/recovery/bootcode4.bin
new file mode 120000
index 0000000..834c703
--- /dev/null
+++ b/recovery/bootcode4.bin
@@ -0,0 +1 @@
+../recovery.bin
\ No newline at end of file
diff --git a/recovery/bootcode4.bin b/recovery/bootcode4.bin
deleted file mode 100644
index e7f1238..0000000
--- a/recovery/bootcode4.bin
+++ /dev/null
diff --git a/rpi-imager-embedded/bootcode4.bin b/rpi-imager-embedded/bootcode4.bin
new file mode 120000
index 0000000..1792f20
--- /dev/null
+++ b/rpi-imager-embedded/bootcode4.bin
@@ -0,0 +1 @@
+../bootcode4.bin
\ No newline at end of file
diff --git a/rpi-imager-embedded/bootcode4.bin b/rpi-imager-embedded/bootcode4.bin
deleted file mode 100644
index b16eb3d..0000000
--- a/rpi-imager-embedded/bootcode4.bin
+++ /dev/null
diff --git a/secure-boot-example/bootcode4.bin b/secure-boot-example/bootcode4.bin
new file mode 120000
index 0000000..1792f20
--- /dev/null
+++ b/secure-boot-example/bootcode4.bin
@@ -0,0 +1 @@
+../bootcode4.bin
\ No newline at end of file
diff --git a/secure-boot-example/bootcode4.bin b/secure-boot-example/bootcode4.bin
deleted file mode 100644
index b16eb3d..0000000
--- a/secure-boot-example/bootcode4.bin
+++ /dev/null
diff --git a/secure-boot-msd/bootcode4.bin b/secure-boot-msd/bootcode4.bin
new file mode 120000
index 0000000..1792f20
--- /dev/null
+++ b/secure-boot-msd/bootcode4.bin
@@ -0,0 +1 @@
+../bootcode4.bin
\ No newline at end of file
diff --git a/secure-boot-msd/bootcode4.bin b/secure-boot-msd/bootcode4.bin
deleted file mode 100644
index e31e21e..0000000
--- a/secure-boot-msd/bootcode4.bin
+++ /dev/null
diff --git a/secure-boot-recovery/bootcode4.bin b/secure-boot-recovery/bootcode4.bin
new file mode 120000
index 0000000..834c703
--- /dev/null
+++ b/secure-boot-recovery/bootcode4.bin
@@ -0,0 +1 @@
+../recovery.bin
\ No newline at end of file
diff --git a/secure-boot-recovery/bootcode4.bin b/secure-boot-recovery/bootcode4.bin
deleted file mode 100644
index e7f1238..0000000
--- a/secure-boot-recovery/bootcode4.bin
+++ /dev/null
diff --git a/win32/install_script.nsi b/win32/install_script.nsi
index 717a3f4..c0c7685 100644
--- a/win32/install_script.nsi
+++ b/win32/install_script.nsi
@@ -95,25 +95,32 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot
   File /r redist
   
   SetOutPath "$INSTDIR\msd"
-  File /r ..\msd\*.*
+  File /r /x bootcode4.bin ..\msd\*.*
+  File ..\bootcode4.bin 
   
   SetOutPath "$INSTDIR\recovery"
-  File /r ..\recovery\*.*
+  File /r /x bootcode4.bin ..\recovery\*.*
+  File /oname=bootcode4.bin ..\recovery.bin
   
   SetOutPath "$INSTDIR\mass-storage-gadget"
-  File /r ..\mass-storage-gadget\*.*
+  File /r /x bootcode4.bin ..\mass-storage-gadget\*.*
+  File ..\bootcode4.bin 
   
   SetOutPath "$INSTDIR\rpi-imager-embedded"
-  File /r ..\rpi-imager-embedded\*.*
+  File /r /x bootcode4.bin ..\rpi-imager-embedded\*.*
+  File ..\bootcode4.bin 
   
   SetOutPath "$INSTDIR\secure-boot-example"
-  File /r ..\secure-boot-example\*.*
+  File /r /x bootcode4.bin ..\secure-boot-example\*.*
+  File ..\bootcode4.bin 
   
   SetOutPath "$INSTDIR\secure-boot-msd"
-  File /r ..\secure-boot-msd\*.*
+  File /r /x bootcode4.bin ..\secure-boot-msd\*.*
+  File ..\bootcode4.bin 
   
   SetOutPath "$INSTDIR\secure-boot-recovery"
-  File /r ..\secure-boot-recovery\*.*
+  File /r /x bootcode4.bin ..\secure-boot-recovery\*.*
+  File /oname=bootcode4.bin ..\recovery.bin
   
   SetOutPath "$INSTDIR\tools"
   File /r ..\tools\*.*
diff --git a/win32/rpiboot_setup.exe b/win32/rpiboot_setup.exe
index f05fc7b..5cb5bda 100755
--- a/win32/rpiboot_setup.exe
+++ b/win32/rpiboot_setup.exe