diff --git a/Makefile b/Makefile
index 039dfbb47..ec9d76ae2 100644
--- a/Makefile
+++ b/Makefile
@@ -873,60 +873,14 @@ install-bin:
 	@cp tuxpaint$(EXE_EXT) $(BIN_PREFIX)
 	@chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint$(EXE_EXT)
 
-# Install the required Windows DLLs into the 'bdist' directory
+# Install tuxpaint-config and required Windows DLLs into the 'bdist' directory
 .PHONY: install-dlls
 install-dlls:
 	@echo
 	@echo "...Installing Windows DLLs..."
 	@install -d $(BIN_PREFIX)
-	@cp `which tuxpaint-config` $(BIN_PREFIX)
-	@cp `which imagequant.dll` $(BIN_PREFIX)
-	@cp `which libbrotlicommon.dll` $(BIN_PREFIX)
-	@cp `which libbrotlidec.dll` $(BIN_PREFIX)
-	@cp `which libbz2-1.dll` $(BIN_PREFIX)
-	@cp `which libcairo-2.dll` $(BIN_PREFIX)
-	@cp `which libcairo-gobject-2.dll` $(BIN_PREFIX)
-	@cp `which libdatrie-1.dll` $(BIN_PREFIX)
-	@cp `which libexpat-1.dll` $(BIN_PREFIX)
-	@cp `which libffi-7.dll` $(BIN_PREFIX)
-	@cp `which libfontconfig-1.dll` $(BIN_PREFIX)
-	@cp `which libfreetype-6.dll` $(BIN_PREFIX)
-	@cp `which libfribidi-0.dll` $(BIN_PREFIX)
-	@cp `which $(LIBGCC_S_DLL)` $(BIN_PREFIX)
-	@cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX)
-	@cp `which libgio-2.0-0.dll` $(BIN_PREFIX)
-	@cp `which libglib-2.0-0.dll` $(BIN_PREFIX)
-	@cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX)
-	@cp `which libgobject-2.0-0.dll` $(BIN_PREFIX)
-	@cp `which libgraphite2.dll` $(BIN_PREFIX)
-	@cp `which libharfbuzz-0.dll` $(BIN_PREFIX)
-	@cp `which libiconv-2.dll` $(BIN_PREFIX)
-	@cp `which libintl-8.dll` $(BIN_PREFIX)
-	@cp `which libjpeg-8.dll` $(BIN_PREFIX)
-	@cp `which liblzma-5.dll` $(BIN_PREFIX)
-	@cp `which libmad-0.dll` $(BIN_PREFIX)
-	@cp `which libpango-1.0-0.dll` $(BIN_PREFIX)
-	@cp `which libpangocairo-1.0-0.dll` $(BIN_PREFIX)
-	@cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX)
-	@cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX)
-	@cp `which libpcre-1.dll` $(BIN_PREFIX)
-	@cp `which libpixman-1-0.dll` $(BIN_PREFIX)
-	@cp `which libpng16-16.dll` $(BIN_PREFIX)
-	@cp `which librsvg-2-2.dll` $(BIN_PREFIX)
-	@cp `which libSDL_mixer-1-2-0.dll` $(BIN_PREFIX)
-	@cp `which libSDL_Pango-1.dll` $(BIN_PREFIX)
-	@cp `which libstdc++-6.dll` $(BIN_PREFIX)
-	@cp `which libthai-0.dll` $(BIN_PREFIX)
-	@cp `which libtiff-5.dll` $(BIN_PREFIX)
-	@cp `which libwebp-7.dll` $(BIN_PREFIX)
-	@cp `which libwinpthread-1.dll` $(BIN_PREFIX)
-	@cp `which libxml2-2.dll` $(BIN_PREFIX)
-	@cp `which libzstd.dll` $(BIN_PREFIX)
-	@cp `which mgwfltknox-1.3.dll` $(BIN_PREFIX)
-	@cp `which SDL.dll` $(BIN_PREFIX)
-	@cp `which SDL_image.dll` $(BIN_PREFIX)
-	@cp `which SDL_ttf.dll` $(BIN_PREFIX)
-	@cp `which zlib1.dll` $(BIN_PREFIX)
+	@cp $(TPCONF_PATH)/tuxpaint-config.exe $(BIN_PREFIX)
+	@src/install-dlls.sh $(TPCONF_PATH) $(BIN_PREFIX)
 	@strip -s $(BIN_PREFIX)/*.dll
 	@echo
 	@echo "...Installing Configuration Files..."
diff --git a/src/install-dlls.sh b/src/install-dlls.sh
new file mode 100644
index 000000000..c664432a0
--- /dev/null
+++ b/src/install-dlls.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for dll in `ldd tuxpaint.exe $1/tuxpaint-config.exe 2>&1 | grep /mingw | awk '{print $3}' | sort | uniq`
+do
+  cp $dll $2
+done