3 files changed, 8 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 865c3b95..a85c5e13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,9 +75,11 @@ AS_IF([[test "x$lt_sysroot" != "x" && test "x$SYSROOT" = "x"]], [[SYSROOT="$lt_s
 PACKAGE_VERSION_MAJOR='m4_car(m4_unquote(m4_split(AC_PACKAGE_VERSION, [\.])))'
 PACKAGE_VERSION_MINOR='m4_argn(2, m4_unquote(m4_split(AC_PACKAGE_VERSION, [\.])))'
 PACKAGE_VERSION_SUBMINOR='m4_argn(3, m4_unquote(m4_split(AC_PACKAGE_VERSION, [\.])))'
+AS_VAR_ARITH([MHD_W32_DLL_SUFF],[[$LIB_VERSION_CURRENT - $LIB_VERSION_AGE]])
 AC_SUBST([PACKAGE_VERSION_MAJOR])
 AC_SUBST([PACKAGE_VERSION_MINOR])
 AC_SUBST([PACKAGE_VERSION_SUBMINOR])
+AC_SUBST([MHD_W32_DLL_SUFF])
 AC_CONFIG_FILES([src/microhttpd/microhttpd_dll_res.rc])
 
 MHD_LIB_CPPFLAGS=""
diff --git a/src/microhttpd/microhttpd_dll_res.rc.in b/src/microhttpd/microhttpd_dll_res.rc.in
index 923f3a90..16a6bba7 100644
--- a/src/microhttpd/microhttpd_dll_res.rc.in
+++ b/src/microhttpd/microhttpd_dll_res.rc.in
@@ -19,11 +19,11 @@ BEGIN
             VALUE "ProductName", "GNU libmicrohttpd\0"
             VALUE "ProductVersion", "@PACKAGE_VERSION@\0"
             VALUE "FileVersion", "@PACKAGE_VERSION@\0"
-            VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (GCC build)\0"
+            VALUE "FileDescription", "GNU libmicrohttpd DLL for Windows (MinGW build)\0"
             VALUE "InternalName", "libmicrohttpd\0"
-            VALUE "OriginalFilename", "libmicrohttpd.dll\0"
+            VALUE "OriginalFilename", "libmicrohttpd-@MHD_W32_DLL_SUFF@.dll\0"
             VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "LegalCopyright",  "Copyright (C) 2007-2015 Christian Grothoff and project contributors\0"
+            VALUE "LegalCopyright",  "Copyright (C) 2007-2017 Christian Grothoff and project contributors\0"
             VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0"
         END
     END
diff --git a/w32/common/microhttpd_dll_res_vc.rc.in b/w32/common/microhttpd_dll_res_vc.rc.in
index 19eb37cb..97a650d5 100644
--- a/w32/common/microhttpd_dll_res_vc.rc.in
+++ b/w32/common/microhttpd_dll_res_vc.rc.in
@@ -26,12 +26,12 @@ BEGIN
             VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (VC build)\0"
             VALUE "InternalName", "libmicrohttpd\0"
 #if defined(_DEBUG)
-            VALUE "OriginalFilename", "libmicrohttpd_d.dll\0"
+            VALUE "OriginalFilename", "libmicrohttpd-dll_d.dll\0"
 #else
-            VALUE "OriginalFilename", "libmicrohttpd.dll\0"
+            VALUE "OriginalFilename", "libmicrohttpd-dll.dll\0"
 #endif
             VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "LegalCopyright",  "Copyright (C) 2007-2015 Christian Grothoff and project contributors\0"
+            VALUE "LegalCopyright",  "Copyright (C) 2007-2017 Christian Grothoff and project contributors\0"
             VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0"
         END
     END