diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index c0acdf5a..350d1b31 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -7,7 +7,11 @@
 !define FREETYPEDLL libfreetype-6.dll
 !define JPEGDLL     libjpeg-9.dll
 !define PNGDLL      libpng16-16.dll
+!if /FileExists ..\bin\libtiff-5.dll
 !define TIFFDLL     libtiff-5.dll
+!else if /FileExists ..\bin\libtiff-6.dll
+!define TIFFDLL     libtiff-6.dll
+!endif
 
 ;--------------------------------
 ;Include Modern UI
diff --git a/src/Makefile b/src/Makefile
index 5787ae79..7de9c1c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -146,7 +146,7 @@ ifdef COMSPEC
   PLATFORM = win32
   #some misc files we have to add to the release archive under windows.
   PLATFORMFILES += $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
-  PLATFORMFILES += bin/libtiff-5.dll
+  PLATFORMFILES += $(wildcard ../bin/libtiff-*.dll)
   ifdef APPVEYOR
   ZIP = 7z
   ZIPOPT = a
@@ -534,7 +534,7 @@ endif
       PLATFORM = win32
       PLATFORMOBJ = winres.o
       PLATFORMFILES = $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
-      PLATFORMFILES += bin/libtiff-5.dll
+      PLATFORMFILES += $(wildcard ../bin/libtiff-*.dll)
       ifeq ($(API),sdl)
       PLATFORMFILES += bin/SDL.dll bin/SDL_image.dll
       endif