diff --git a/.gitignore b/.gitignore
index 6556c1a..cfcdcf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.swp
 /git-extra/pkg/
 /git-extra/src/
+/installer/bindimage.txt
 /installer/install.iss
 /installer/install.out
 /installer/is-unicode.exe
diff --git a/installer/install.iss.in b/installer/install.iss.in
index fff0f30..c61efce 100644
--- a/installer/install.iss.in
+++ b/installer/install.iss.in
@@ -10,7 +10,7 @@
 #define MINGW_BITNESS '%MINGW_BITNESS%'
 #define APP_URL       'http://git-for-windows.github.io/'
 #define APP_BUILTINS  'share\git\builtins.txt'
-TODO: generate #define APP_BINDIMAGE 'share\git\bindimage.txt'
+#define APP_BINDIMAGE 'share\git\bindimage.txt'
 
 #define PLINK_PATH_ERROR_MSG 'Please enter a valid path to a Plink executable.'
 
diff --git a/installer/release.sh b/installer/release.sh
index 2311860..53582cc 100755
--- a/installer/release.sh
+++ b/installer/release.sh
@@ -84,6 +84,12 @@ sed -e 's|/|\\|g' \
 	-e 's|^\(.*\)\\\([^\\]*\)$|Source: \1\\\2; DestDir: {app}\\\1; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore|' \
 	>> file-list.iss
 
+echo "Generating bindimage.txt"
+pacman -Ql mingw-w64-$ARCH-git |
+sed -n -e 's|^[^ ]* /\(.*\.exe\)$|\1|p' \
+	-e 's|^[^ ]* /\(.*\.dll\)$|\1|p' > bindimage.txt
+echo "Source: \"$SCRIPTDIR\\bindimage.txt\"; DestDir: {app}\\mingw$BITNESS\\share\git\bindimage.txt; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" >> file-list.iss
+
 sed -e "s|%APPVERSION%|$version|" -e "s|%MINGW_BITNESS%|mingw$BITNESS|" < install.iss.in > install.iss ||
 exit