diff --git a/CMakeLists.txt b/CMakeLists.txt
index 212ae7ce78..1a7ec440e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,10 +36,14 @@ cmake_policy(SET CMP0015 NEW)
 # WIRESHARK_TARGET_PLATFORM accordingly. Otherwise use
 # %WIRESHARK_TARGET_PLATFORM%.
 if(WIN32)
-	if("${CMAKE_GENERATOR}" MATCHES "Win64")
+	if("${CMAKE_GENERATOR}" MATCHES ".*Win64$")
 		set(WIRESHARK_TARGET_PLATFORM win64)
-	elseif("${WIRESHARK_TARGET_PLATFORM}" MATCHES "Visual Studio")
+		set(PROCESSOR_ARCHITECTURE amd64)
+		message("Building for x64")
+	elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio.*")
 		set(WIRESHARK_TARGET_PLATFORM win32)
+		set(PROCESSOR_ARCHITECTURE x86)
+		message("Building for x86")
 	else()
 		set(WIRESHARK_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM})
 	endif()
@@ -87,10 +91,15 @@ include(CMakeInstallDirs)
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 99)
 set(PROJECT_PATCH_VERSION 2)
-set(PROJECT_VERSION_EXTENSION "")
-
+set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
 set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION})
 
+# These are required in .rc files and manifests
+set(VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
+set(VERSION_MINOR ${PROJECT_MINOR_VERSION})
+set(VERSION_MICRO ${PROJECT_PATCH_VERSION})
+set(RC_VERSION ${PROJECT_MAJOR_VERSION},${PROJECT_MINOR_VERSION},${PROJECT_PATCH_VERSION},0)
+
 message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.")
 
 include(UseLemon)
@@ -896,6 +905,7 @@ endif()
 set( VERSION ${PROJECT_VERSION} )
 set( configure_input "Built with CMake ${CMAKE_VERSION}" )
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
+set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/")
 set( IN_FILES
 	adns_dll.rc
 	capchild/doxygen.cfg.in
@@ -918,21 +928,8 @@ set( IN_FILES
 	image/captype.rc.in
 	image/libwsutil.rc.in
 	image/wiretap.rc.in
+	image/wireshark.exe.manifest.in
 	packaging/macosx/Info.plist.in
-	plugins/ethercat/plugin.rc.in
-	plugins/unistim/plugin.rc.in
-	plugins/opcua/plugin.rc.in
-	plugins/wimax/plugin.rc.in
-	plugins/gryphon/plugin.rc.in
-	plugins/profinet/plugin.rc.in
-	plugins/m2m/plugin.rc.in
-	plugins/stats_tree/plugin.rc.in
-	plugins/wimaxasncp/plugin.rc.in
-	plugins/mate/plugin.rc.in
-	plugins/wimaxmacphy/plugin.rc.in
-	plugins/irda/plugin.rc.in
-	plugins/docsis/plugin.rc.in
-	plugins/easy_codec/plugin.rc.in
 	${CUSTOM_PLUGIN_IN_FILES}
 	ui/doxygen.cfg.in
 	ui/gtk/doxygen.cfg.in
@@ -946,7 +943,7 @@ foreach( _in_file ${IN_FILES} )
 endforeach()
 
 include(FeatureSummary)
-#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
+#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ])
 SET_FEATURE_INFO(SBC "SBC Codec for Bluetooth A2DP stream playing" "www: http://git.kernel.org/cgit/bluetooth/sbc.git" )
 
 FEATURE_SUMMARY(WHAT ALL)
@@ -1128,7 +1125,7 @@ if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) )
 	)
 	set(wireshark_FILES
 		${WIRESHARK_SRC}
-		image/wireshark.rc
+		${CMAKE_BINARY_DIR}/image/wireshark.rc
 		${PLATFORM_UI_RC_FILES}
 	)
 endif()
@@ -1365,7 +1362,7 @@ if(BUILD_tshark)
 		tshark.c
 		${TSHARK_TAP_SRC}
 		${SHARK_COMMON_SRC}
-		image/tshark.rc
+		${CMAKE_BINARY_DIR}/image/tshark.rc
 	)
 	add_executable(tshark ${tshark_FILES})
 	set_extra_executable_properties(tshark "Executables")
@@ -1384,7 +1381,7 @@ if(BUILD_tfshark)
 		tfshark.c
 		${TSHARK_TAP_SRC}
 		${SHARK_COMMON_SRC}
-		image/tfshark.rc
+		${CMAKE_BINARY_DIR}/image/tfshark.rc
 	)
 	add_executable(tfshark ${tfshark_FILES})
 	set_extra_executable_properties(tfshark "Executables")
@@ -1403,7 +1400,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
 		${SHARK_COMMON_SRC}
 		rawshark.c
 		ui/util.c
-		image/rawshark.rc
+		${CMAKE_BINARY_DIR}/image/rawshark.rc
 	)
 	add_executable(rawshark ${rawshark_FILES})
 	set_extra_executable_properties(rawshark "Executables")
@@ -1458,7 +1455,7 @@ if(BUILD_text2pcap)
 	)
 	set(text2pcap_FILES
 		${text2pcap_CLEAN_FILES}
-		image/text2pcap.rc
+		${CMAKE_BINARY_DIR}/image/text2pcap.rc
 	)
 	add_lex_files(text2pcap_FILES
 		text2pcap-scanner.l
@@ -1477,7 +1474,7 @@ if(BUILD_mergecap)
 	)
 	set(mergecap_FILES
 		mergecap.c
-		image/mergecap.rc
+		${CMAKE_BINARY_DIR}/image/mergecap.rc
 	)
 	add_executable(mergecap ${mergecap_FILES})
 	set_extra_executable_properties(mergecap "Executables")
@@ -1493,7 +1490,7 @@ if(BUILD_reordercap)
 	)
 	set(reordercap_FILES
 		reordercap.c
-		image/reordercap.rc
+		${CMAKE_BINARY_DIR}/image/reordercap.rc
 	)
 	add_executable(reordercap ${reordercap_FILES})
 	set_extra_executable_properties(reordercap "Executables")
@@ -1511,7 +1508,7 @@ if(BUILD_capinfos)
 	)
 	set(capinfos_FILES
 		capinfos.c
-		image/capinfos.rc
+		${CMAKE_BINARY_DIR}/image/capinfos.rc
 	)
 	add_executable(capinfos ${capinfos_FILES})
 	set_extra_executable_properties(capinfos "Executables")
@@ -1528,7 +1525,7 @@ if(BUILD_captype)
 	)
 	set(captype_FILES
 		captype.c
-		image/captype.rc
+		${CMAKE_BINARY_DIR}/image/captype.rc
 	)
 	add_executable(captype ${captype_FILES})
 	set_extra_executable_properties(captype "Executables")
@@ -1544,7 +1541,7 @@ if(BUILD_editcap)
 	)
 	set(editcap_FILES
 		editcap.c
-		image/editcap.rc
+		${CMAKE_BINARY_DIR}/image/editcap.rc
 	)
 	add_executable(editcap ${editcap_FILES})
 	set_extra_executable_properties(editcap "Executables")
@@ -1575,7 +1572,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		pcapio.c
 		ringbuffer.c
 		sync_pipe_write.c
-		image/dumpcap.rc
+		${CMAKE_BINARY_DIR}/image/dumpcap.rc
 	)
 	add_executable(dumpcap ${dumpcap_FILES})
 	set_extra_executable_properties(dumpcap "Executables")
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index f90a561a51..73699befdb 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -5,8 +5,10 @@
 /* Name of package */
 #define PACKAGE "wireshark"
 
+#define VERSION_EXTRA "$ENV{WIRESHARK_VERSION_EXTRA}"
+
 /* Version number of package */
-#define VERSION "${CPACK_PACKAGE_VERSION}"
+#define VERSION "${CPACK_PACKAGE_VERSION}${VERSION_EXTRA}"
 #define VERSION_MAJOR ${PROJECT_MAJOR_VERSION}
 #define VERSION_MINOR ${PROJECT_MINOR_VERSION}
 #define VERSION_MICRO ${PROJECT_PATCH_VERSION}
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index f8f870f6fd..fe64bf921f 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1710,7 +1710,7 @@ add_library(epan ${LINK_MODE_LIB}
 	${DISSECTOR_FILES}
 	${DISSECTOR_SUPPORT_SRC}
 	${LIBWIRESHARK_ASM_FILES}
-	../image/libwireshark.rc
+	${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
 set(FULL_SO_VERSION "0.0.0")
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index de5c615b16..d7910e651a 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -18,6 +18,7 @@ wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake
 wireshark.rc   : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< wireshark.rc.in > $@
 
 libwireshark.rc: libwireshark.rc.in ..\config.nmake
@@ -28,46 +29,55 @@ libwireshark.rc: libwireshark.rc.in ..\config.nmake
 tshark.rc  : tshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< tshark.rc.in > $@
 
 tfshark.rc  : tfshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< tfshark.rc.in > $@
 
 rawshark.rc  : rawshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< rawshark.rc.in > $@
 
 capinfos.rc    : capinfos.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< capinfos.rc.in > $@
 
 captype.rc    : captype.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< captype.rc.in > $@
 
 editcap.rc    : editcap.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< editcap.rc.in > $@
 
 mergecap.rc   : mergecap.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< mergecap.rc.in > $@
 
 reordercap.rc   : reordercap.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< reordercap.rc.in > $@
 
 text2pcap.rc  : text2pcap.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< text2pcap.rc.in > $@
 
 wiretap.rc    : wiretap.rc.in ..\config.nmake
@@ -83,6 +93,7 @@ libwsutil.rc  : libwsutil.rc.in ..\config.nmake
 dumpcap.rc   : dumpcap.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		-e s/@ICON_PATH@// \
 		< dumpcap.rc.in > $@
 
 clean :
diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in
index d4b764f24b..947dc39c8a 100644
--- a/image/capinfos.rc.in
+++ b/image/capinfos.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/captype.rc.in b/image/captype.rc.in
index 631732790f..f53b61e08e 100644
--- a/image/captype.rc.in
+++ b/image/captype.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in
index d3a7e71e5f..459730c39f 100644
--- a/image/dumpcap.rc.in
+++ b/image/dumpcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/editcap.rc.in b/image/editcap.rc.in
index b4fdd1f6dd..8c9bc6251b 100644
--- a/image/editcap.rc.in
+++ b/image/editcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in
index e40e37ec10..46b595b2a4 100644
--- a/image/mergecap.rc.in
+++ b/image/mergecap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/rawshark.rc.in b/image/rawshark.rc.in
index 47afa8517a..314f98a173 100644
--- a/image/rawshark.rc.in
+++ b/image/rawshark.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/reordercap.rc.in b/image/reordercap.rc.in
index 968c6c56ab..6a7889ebc6 100644
--- a/image/reordercap.rc.in
+++ b/image/reordercap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/text2pcap.rc.in b/image/text2pcap.rc.in
index b62624a7ec..0bf2e20f91 100644
--- a/image/text2pcap.rc.in
+++ b/image/text2pcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/tfshark.rc.in b/image/tfshark.rc.in
index 7e0fb13e30..d2b1a9d66c 100644
--- a/image/tfshark.rc.in
+++ b/image/tfshark.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/tshark.rc.in b/image/tshark.rc.in
index 7e61e6fd06..72eb551aed 100644
--- a/image/tshark.rc.in
+++ b/image/tshark.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-WIRESHARK_ICON		ICON			"wireshark.ico"
+WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in
index a2b61e2b4d..bd181c76b7 100644
--- a/image/wireshark.rc.in
+++ b/image/wireshark.rc.in
@@ -1,7 +1,7 @@
 #include "winver.h"
 
-WIRESHARK_ICON1		ICON			"wireshark.ico"
-WIRESHARK_ICON2	ICON			"wiresharkdoc.ico"
+WIRESHARK_ICON1 ICON "@ICON_PATH@wireshark.ico"
+WIRESHARK_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 9d9a5aac8f..1868831c4b 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -19,6 +19,31 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE docsis)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 5)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
+# The sources for the plugin
 set(DISSECTOR_SRC
 	packet-bintrngreq.c
 	packet-bpkmattr.c
@@ -92,7 +117,7 @@ register_dissector_files(plugin.c
 
 add_library(docsis ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(docsis PROPERTIES
diff --git a/plugins/docsis/plugin.rc.in b/plugins/docsis/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/docsis/plugin.rc.in
+++ b/plugins/docsis/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/easy_codec/ReadMe.txt b/plugins/easy_codec/ReadMe.txt
index d403642a38..e85783704f 100644
--- a/plugins/easy_codec/ReadMe.txt
+++ b/plugins/easy_codec/ReadMe.txt
@@ -9,5 +9,6 @@ Instructions on compiling the Easy Codecs
 2. Build plugin.
 	Win32: nmake -f makefile.nmake
 	Linux: TO DO
+	CMake: TO DO
 
 
diff --git a/plugins/easy_codec/plugin.rc.in b/plugins/easy_codec/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/easy_codec/plugin.rc.in
+++ b/plugins/easy_codec/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 46d7a00622..3b07a4407f 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE ethercat)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 1)
+set(MODULE_VERSION_MICRO 0)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERISON variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-ams.c
 	packet-ecatmb.c
@@ -55,7 +79,7 @@ register_dissector_files(plugin.c
 
 add_library(ethercat ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(ethercat PROPERTIES
diff --git a/plugins/ethercat/plugin.rc.in b/plugins/ethercat/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/ethercat/plugin.rc.in
+++ b/plugins/ethercat/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 22eeae68af..9dca0f8a2b 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE gryphon)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 4)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-gryphon.c
 )
@@ -49,7 +73,7 @@ register_dissector_files(plugin.c
 
 add_library(gryphon ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(gryphon PROPERTIES
diff --git a/plugins/gryphon/plugin.rc.in b/plugins/gryphon/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/gryphon/plugin.rc.in
+++ b/plugins/gryphon/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index aa7d891fa5..67f168c575 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE irda)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 6)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-ircomm.c
 	packet-irda.c
@@ -51,7 +75,7 @@ register_dissector_files(plugin.c
 
 add_library(irda ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(irda PROPERTIES
diff --git a/plugins/irda/plugin.rc.in b/plugins/irda/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/irda/plugin.rc.in
+++ b/plugins/irda/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index 6a779b909b..5cb5c9923f 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE m2m)
+set(MODULE_VERSION_MAJOR 1)
+set(MODULE_VERSION_MINOR 1)
+set(MODULE_VERSION_MICRO 0)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-m2m.c
 )
@@ -54,7 +78,7 @@ register_dissector_files(plugin.c
 
 add_library(m2m ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(m2m PROPERTIES
diff --git a/plugins/m2m/plugin.rc.in b/plugins/m2m/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/m2m/plugin.rc.in
+++ b/plugins/m2m/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index e4dc6fe3b9..6372e54d1b 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE mate)
+set(MODULE_VERSION_MAJOR 1)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 0)
+set(MODULE_VERSION_EXTRA 1)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-mate.c
 )
@@ -70,7 +94,7 @@ register_dissector_files(plugin.c
 
 add_library(mate ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(mate PROPERTIES
diff --git a/plugins/mate/plugin.rc.in b/plugins/mate/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/mate/plugin.rc.in
+++ b/plugins/mate/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index a25e0fdfa7..8feeff1b0b 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -19,6 +19,27 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# This info is from moduleinfo.nmake
+set(PACKAGE opcua)
+set(MODULE_VERSION_MAJOR 1)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 0)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	opcua.c
 )
@@ -64,7 +85,7 @@ register_dissector_files(plugin.c
 
 add_library(opcua ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(opcua PROPERTIES
diff --git a/plugins/opcua/plugin.rc.in b/plugins/opcua/plugin.rc.in
index 665276e936..0ad7587981 100644
--- a/plugins/opcua/plugin.rc.in
+++ b/plugins/opcua/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 48d1791424..45ff67ff92 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE profinet)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 2)
+set(MODULE_VERSION_MICRO 4)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-dcerpc-pn-io.c
 	packet-dcom-cba.c
@@ -61,7 +85,7 @@ register_dissector_files(plugin.c
 
 add_library(profinet ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(profinet PROPERTIES
diff --git a/plugins/profinet/plugin.rc.in b/plugins/profinet/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/profinet/plugin.rc.in
+++ b/plugins/profinet/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index dfe20daaa2..7cd16448bc 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE stats_tree)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 1)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(TAP_SRC
 	stats_tree_plugin.c
 	pinfo_stats_tree.c
@@ -38,7 +62,7 @@ endif()
 
 add_library(stats_tree ${LINK_MODE_MODULE}
 	${TAP_SRC}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(stats_tree PROPERTIES
diff --git a/plugins/stats_tree/plugin.rc.in b/plugins/stats_tree/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/stats_tree/plugin.rc.in
+++ b/plugins/stats_tree/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index d6b678bdcd..f60689a402 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -19,6 +19,27 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# This info is from moduleinfo.nmake
+set(PACKAGE unistim)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 2)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-unistim.c
 )
@@ -49,7 +70,7 @@ register_dissector_files(plugin.c
 
 add_library(unistim ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(unistim PROPERTIES
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index 6b2e1ea4e0..77a146c22c 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE wimax)
+set(MODULE_VERSION_MAJOR 1)
+set(MODULE_VERSION_MINOR 1)
+set(MODULE_VERSION_MICRO 0)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-wmx.c
 )
@@ -94,7 +118,7 @@ register_dissector_files(plugin.c
 
 add_library(wimax ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(wimax PROPERTIES
diff --git a/plugins/wimax/plugin.rc.in b/plugins/wimax/plugin.rc.in
index 47bd20049f..e63db077fb 100644
--- a/plugins/wimax/plugin.rc.in
+++ b/plugins/wimax/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index 0022b57d29..96d2a98e99 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE wimaxasncp)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 1)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-wimaxasncp.c
 )
@@ -53,7 +77,7 @@ register_dissector_files(plugin.c
 
 add_library(wimaxasncp ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(wimaxasncp PROPERTIES
diff --git a/plugins/wimaxasncp/plugin.rc.in b/plugins/wimaxasncp/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/wimaxasncp/plugin.rc.in
+++ b/plugins/wimaxasncp/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index f524915208..657dd1d380 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -19,6 +19,30 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# Create the Windows .rc file for the plugin.
+# The values come from several files in the source, I can't see how to reuse them
+
+# This info is from moduleinfo.nmake
+set(PACKAGE wimaxmacphy)
+set(MODULE_VERSION_MAJOR 0)
+set(MODULE_VERSION_MINOR 0)
+set(MODULE_VERSION_MICRO 1)
+set(MODULE_VERSION_EXTRA 0)
+set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}")
+set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}")
+
+# This info is from Makefile.common
+set(PLUGIN_NAME ${PACKAGE})
+
+# This info is from config.nmake
+set(MSVC_VARIANT "${CMAKE_GENERATOR}")
+
+# The rc.in requires a plain VERSION variable
+set(VERSION ${PROJECT_VERSION})
+
+# Create the plugin.rc file from the template
+configure_file(plugin.rc.in plugin.rc @ONLY)
+
 set(DISSECTOR_SRC
 	packet-wimaxmacphy.c
 )
@@ -49,7 +73,7 @@ register_dissector_files(plugin.c
 
 add_library(wimaxmacphy ${LINK_MODE_MODULE}
 	${PLUGIN_FILES}
-	plugin.rc
+	${CMAKE_CURRENT_BINARY_DIR}/plugin.rc
 )
 
 set_target_properties(wimaxmacphy PROPERTIES
diff --git a/plugins/wimaxmacphy/plugin.rc.in b/plugins/wimaxmacphy/plugin.rc.in
index 568dc07b49..cac1f406ac 100644
--- a/plugins/wimaxmacphy/plugin.rc.in
+++ b/plugins/wimaxmacphy/plugin.rc.in
@@ -24,7 +24,7 @@ BEGIN
             VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
             VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
+            VALUE "Comments", "Built with @MSVC_VARIANT@\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 10a746c4fb..1e7ead3ad8 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -113,7 +113,7 @@ set(wiretap_LIBS
 
 add_library(wiretap ${LINK_MODE_LIB}
 	${WIRETAP_FILES}
-	../image/wiretap.rc
+	${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 
 set(FULL_SO_VERSION "0.0.0")
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index b3bdbb383f..ec2896da5b 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -149,7 +149,7 @@ endif()
 
 add_library(wsutil ${LINK_MODE_LIB}
 	${WSUTIL_FILES}
-	../image/libwsutil.rc
+	${CMAKE_BINARY_DIR}/image/libwsutil.rc
 )
 
 add_dependencies(wsutil gitversion)