diff --git a/Makefile b/Makefile
index 57b196dc9..e461bcd1e 100644
--- a/Makefile
+++ b/Makefile
@@ -745,6 +745,7 @@ install-dlls:
 	@echo
 	@echo "...Installing Windows DLLs..."
 	@install -d $(BIN_PREFIX)
+	@cp `which tuxpaint-config.exe` $(BIN_PREFIX)
 	@cp `which libintl-8.dll` $(BIN_PREFIX)
 	@cp `which libiconv-2.dll` $(BIN_PREFIX)
 	@cp `which libpng12.dll` $(BIN_PREFIX)
diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss
index 65298e36c..941d3b802 100644
--- a/win32/tuxpaint.iss
+++ b/win32/tuxpaint.iss
@@ -68,30 +68,15 @@ Name: "gal"; MessagesFile: "compiler:Languages\Galician-2-5.1.11.isl"
 Name: "cht"; MessagesFile: "compiler:Languages\ChineseTrad-2-5.1.11.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
 
 [Files]
-Source: "{#BdistDir}\jpeg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libcairo-2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libfreetype-6.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libiconv-2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libintl-8.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libogg-0.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libpng12.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libvorbis-0.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libvorbisfile-3.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\libxml2-2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\SDL_image.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\SDL_mixer.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\SDL_ttf.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\svg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\svg-cairo.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\tuxpaint.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\tuxpaint-config.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#BdistDir}\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BdistDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BdistDir}\*.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BdistDir}\data\*"; DestDir: "{app}\data"; Excludes: "CVS"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BdistDir}\docs\*"; DestDir: "{app}\docs"; Excludes: "CVS,Makefile,*~"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#BdistDir}\etc\*"; DestDir: "{app}\etc"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#BdistDir}\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BdistDir}\im\*"; DestDir: "{app}\im"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BdistDir}\locale\*"; DestDir: "{app}\locale"; Excludes: "CVS"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#BdistDir}\..\libdocs\*"; DestDir: "{app}\docs\libdocs"; Excludes: "CVS,Makefile,*~"; Flags: ignoreversion recursesubdirs createallsubdirs