diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc
index 330d473f1f..5c325d63ab 100644
--- a/dlls/avifil32/rsrc.rc
+++ b/dlls/avifil32/rsrc.rc
@@ -20,10 +20,10 @@
 
 #include "avifile_private.h"
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine AVI file support library"
 #define WINE_FILENAME_STR "avifil32.dll"
 #define WINE_FILEVERSION 4,0,3,1998
 #define WINE_FILEVERSION_STR "4.03.1998"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/browseui/version.rc b/dlls/browseui/version.rc
index f4365c02a7..731b5d34a0 100644
--- a/dlls/browseui/version.rc
+++ b/dlls/browseui/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "browseui.dll"
 #define WINE_FILEVERSION 6,0,2900,2180
 #define WINE_FILEVERSION_STR "6.0.2900.2180"
 #define WINE_PRODUCTVERSION 6,0,2900,2180
 #define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/comcat/version.rc b/dlls/comcat/version.rc
index a0f91de52b..017fa4571a 100644
--- a/dlls/comcat/version.rc
+++ b/dlls/comcat/version.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILENAME_STR "comcat.dll"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/dlls/ddraw/version.rc b/dlls/ddraw/version.rc
index 2c17734146..65dce6349b 100644
--- a/dlls/ddraw/version.rc
+++ b/dlls/ddraw/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectDraw"
 #define WINE_FILENAME_STR "ddraw.dll"
 #define WINE_FILEVERSION 5,3,1,904
 #define WINE_FILEVERSION_STR "5.3.1.904"
 #define WINE_PRODUCTVERSION 5,3,1,904
 #define WINE_PRODUCTVERSION_STR "5.3.1.904"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/dmusic/version.rc b/dlls/dmusic/version.rc
index 86812fa80a..b1c0232217 100644
--- a/dlls/dmusic/version.rc
+++ b/dlls/dmusic/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectMusic"
 #define WINE_FILENAME_STR "dmusic.dll"
 #define WINE_FILEVERSION 5,3,1,904
 #define WINE_FILEVERSION_STR "5.3.1.904"
 #define WINE_PRODUCTVERSION 5,3,1,904
 #define WINE_PRODUCTVERSION_STR "5.3.1.904"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/dplay/version.rc b/dlls/dplay/version.rc
index 9e704e1ca9..f52c09ca4f 100644
--- a/dlls/dplay/version.rc
+++ b/dlls/dplay/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay"
 #define WINE_FILENAME_STR "dplay.dll"
 #define WINE_FILEVERSION 5,3,0,900
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/dplayx/version.rc b/dlls/dplayx/version.rc
index d043747227..f7f62b422a 100644
--- a/dlls/dplayx/version.rc
+++ b/dlls/dplayx/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay"
 #define WINE_FILENAME_STR "dplayx.dll"
 #define WINE_FILEVERSION 5,3,1,904
 #define WINE_FILEVERSION_STR "5.3.1.904"
 #define WINE_PRODUCTVERSION 5,3,1,904
 #define WINE_PRODUCTVERSION_STR "5.3.1.904"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/dsound/version.rc b/dlls/dsound/version.rc
index 5ea532f2b0..64d9c1f35d 100644
--- a/dlls/dsound/version.rc
+++ b/dlls/dsound/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectSound"
 #define WINE_FILENAME_STR "dsound.dll"
 #define WINE_FILEVERSION 5,3,1,904
 #define WINE_FILEVERSION_STR "5.3.1.904"
 #define WINE_PRODUCTVERSION 5,3,1,904
 #define WINE_PRODUCTVERSION_STR "5.3.1.904"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/dswave/version.rc b/dlls/dswave/version.rc
index 75ad145975..0d7bbb4308 100644
--- a/dlls/dswave/version.rc
+++ b/dlls/dswave/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectMusic Wave"
 #define WINE_FILENAME_STR "dswave.dll"
 #define WINE_FILEVERSION 5,3,0,900
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
 #define WINE_PRODUCTVERSION_STR "5.3"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/explorerframe/version.rc b/dlls/explorerframe/version.rc
index 30dbe68b8e..60f04b6269 100644
--- a/dlls/explorerframe/version.rc
+++ b/dlls/explorerframe/version.rc
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine ExplorerFrame"
 #define WINE_FILENAME_STR "explorerframe.dll"
 #define WINE_FILEVERSION 6,1,7601,16666
 #define WINE_FILEVERSION_STR "6.1.7601.16666"
 #define WINE_PRODUCTVERSION 6,1,7601,16666
 #define WINE_PRODUCTVERSION_STR "6.1.7601.16666"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/gameux/version.rc b/dlls/gameux/version.rc
index a63716396d..286add1966 100644
--- a/dlls/gameux/version.rc
+++ b/dlls/gameux/version.rc
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine Games Explorer"
 #define WINE_FILENAME_STR "gameux.dll"
 #define WINE_FILEVERSION 6,1,7600,16385
 #define WINE_FILEVERSION_STR "6.1.7600.16385"
 #define WINE_PRODUCTVERSION 6,1,7600,16385
 #define WINE_PRODUCTVERSION_STR "6.1.7600.16385"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/mciqtz32/version.rc b/dlls/mciqtz32/version.rc
index 94c6078bd2..b27e76bced 100644
--- a/dlls/mciqtz32/version.rc
+++ b/dlls/mciqtz32/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectShow MCI Driver"
 #define WINE_FILENAME_STR "mciqtz32.dll"
 #define WINE_FILEVERSION 6,5,1,900
 #define WINE_FILEVERSION_STR "6.5.1.900"
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc
index 5e669de70e..db76227d36 100644
--- a/dlls/mshtml/rsrc.rc
+++ b/dlls/mshtml/rsrc.rc
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine HTML Viewer"
 #define WINE_FILENAME_STR "mshtml.dll"
 #define WINE_FILEVERSION 6,0,2800,1106
 #define WINE_FILEVERSION_STR "6.0.2800.1106"
 #define WINE_PRODUCTVERSION 6,0,2800,1106
 #define WINE_PRODUCTVERSION_STR "6.0.2800.1106"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
 
diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc
index dfb8045684..bcd51051b7 100644
--- a/dlls/msxml3/version.rc
+++ b/dlls/msxml3/version.rc
@@ -17,12 +17,12 @@
 /* @makedep: msxml3_v1.tlb */
 1 TYPELIB msxml3_v1.tlb
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0"
 #define WINE_FILENAME_STR "msxml3.dll"
 #define WINE_FILEVERSION 8,90,1101,0
 #define WINE_FILEVERSION_STR "8.90.1101.0"
 #define WINE_PRODUCTVERSION 8,90,1101,0
 #define WINE_PRODUCTVERSION_STR "8.90.1101.0"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc
index ccead7e04f..a8b917fb50 100644
--- a/dlls/msxml6/rsrc.rc
+++ b/dlls/msxml6/rsrc.rc
@@ -19,12 +19,12 @@
 /* @makedep: msxml6_tlb.tlb */
 1 TYPELIB msxml6_tlb.tlb
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0"
 #define WINE_FILENAME_STR "msxml6.dll"
 #define WINE_FILEVERSION 6,10,1129,0
 #define WINE_FILEVERSION_STR "6.10.1129.0"
 #define WINE_PRODUCTVERSION 6,10,1129,0
 #define WINE_PRODUCTVERSION_STR "6.10.1129.0"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/npmshtml/rsrc.rc b/dlls/npmshtml/rsrc.rc
index 2ed88acddc..d57e09cb44 100644
--- a/dlls/npmshtml/rsrc.rc
+++ b/dlls/npmshtml/rsrc.rc
@@ -16,9 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin"
 #define WINE_FILENAME_STR "npmshtml.dll"
-#define WINE_MIMETYPE "application/x-oleobject"
+#define WINE_EXTRAVALUES \
+    VALUE "OLESelfRegister", "" \
+    VALUE "MIMEType", "application/x-oleobject"
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc
index c03197cb3d..11b255a9df 100644
--- a/dlls/ole32/ole32res.rc
+++ b/dlls/ole32/ole32res.rc
@@ -23,10 +23,10 @@
 #include "winuser.h"
 #include "winnls.h"
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILENAME_STR "ole32.dll"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
 
 /*
  * Everything that does not depend on language,
diff --git a/dlls/oleaut32/rsrc.rc b/dlls/oleaut32/rsrc.rc
index 3731b82b76..081f2953f5 100644
--- a/dlls/oleaut32/rsrc.rc
+++ b/dlls/oleaut32/rsrc.rc
@@ -19,10 +19,10 @@
 /* @makedep: oleaut32.rgs */
 1 WINE_REGISTRY oleaut32.rgs
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine OLE dll"
 #define WINE_FILENAME_STR "oleaut32.dll"
 #define WINE_FILEVERSION 6, 0, 6001, 18000 /* version from Vista SP1 */
 #define WINE_FILEVERSION_STR "6.0.6001.18000"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/olepro32/version.rc b/dlls/olepro32/version.rc
index a78097695d..0be15fd94a 100644
--- a/dlls/olepro32/version.rc
+++ b/dlls/olepro32/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll"
 #define WINE_FILENAME_STR "olepro32.dll"
 #define WINE_FILEVERSION 5,0,4522,0
 #define WINE_FILEVERSION_STR "5.0.4522"
 #define WINE_PRODUCTVERSION 2,40,4522,0
 #define WINE_PRODUCTVERSION_STR "2.40"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/quartz/version.rc b/dlls/quartz/version.rc
index 930039df3f..8245cfbe0d 100644
--- a/dlls/quartz/version.rc
+++ b/dlls/quartz/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine Quartz dll"
 #define WINE_FILENAME_STR "quartz.dll"
 #define WINE_FILEVERSION 6,5,1,902
 #define WINE_FILEVERSION_STR "6.5.1.902"
 #define WINE_PRODUCTVERSION 6,5,1,902
 #define WINE_PRODUCTVERSION_STR "6.5"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc
index 08d9ebc9a3..2c4b6ad497 100644
--- a/dlls/shdocvw/shdocvw.rc
+++ b/dlls/shdocvw/shdocvw.rc
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine core dll"
 #define WINE_FILENAME_STR "shdocvw.dll"
 #define WINE_FILEVERSION 6,0,2900,2180
 #define WINE_FILEVERSION_STR "6.0.2900.2180"
 #define WINE_PRODUCTVERSION 6,0,2900,2180
 #define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
 
diff --git a/dlls/shell32/version.rc b/dlls/shell32/version.rc
index 046387a7a5..b1384e10be 100644
--- a/dlls/shell32/version.rc
+++ b/dlls/shell32/version.rc
@@ -20,7 +20,7 @@
 
 #include "version.h"
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILENAME_STR "shell32.dll"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/dlls/shfolder/version.rc b/dlls/shfolder/version.rc
index 726bd7f464..145254e947 100644
--- a/dlls/shfolder/version.rc
+++ b/dlls/shfolder/version.rc
@@ -14,12 +14,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service"
 #define WINE_FILENAME_STR "shfolder.dll"
 #define WINE_FILEVERSION 6,00,2800,1106
 #define WINE_FILEVERSION_STR "6,00,2800,1106"
 #define WINE_PRODUCTVERSION 6,00,2800,1106
 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/winegstreamer/rsrc.rc b/dlls/winegstreamer/rsrc.rc
index 09c8c774b9..e12ba77bf8 100644
--- a/dlls/winegstreamer/rsrc.rc
+++ b/dlls/winegstreamer/rsrc.rc
@@ -14,13 +14,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine GStreamer"
 #define WINE_FILENAME_STR "winegstreamer.dll"
 #define WINE_FILEVERSION 0,0,1,0
 #define WINE_FILEVERSION_STR "0.0.1.0"
 #define WINE_PRODUCTVERSION 0,0,1,0
 #define WINE_PRODUCTVERSION_STR "1.0.1.0"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
 
diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc
index a6f40a0566..1729f97347 100644
--- a/include/wine/wine_common_ver.rc
+++ b/include/wine/wine_common_ver.rc
@@ -87,6 +87,10 @@ never complain.
 #define WINE_PRODUCTNAME_STR "Wine"
 #endif
 
+#ifndef WINE_EXTRAVALUES
+#define WINE_EXTRAVALUES
+#endif
+
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION    WINE_FILEVERSION
 PRODUCTVERSION WINE_PRODUCTVERSION
@@ -108,12 +112,7 @@ FILESUBTYPE    WINE_FILESUBTYPE
 	    VALUE "OriginalFilename", WINE_FILENAME_STR
 	    VALUE "ProductName", WINE_PRODUCTNAME_STR
 	    VALUE "ProductVersion", WINE_PRODUCTVERSION_STR
-#ifdef WINE_OLESELFREGISTER
-	    VALUE "OLESelfRegister", ""
-#endif
-#ifdef WINE_MIMETYPE
-            VALUE "MIMEType", WINE_MIMETYPE
-#endif
+	    WINE_EXTRAVALUES
 	}
     }
     BLOCK "VarFileInfo"
diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc
index acf7959781..64a976cf4f 100644
--- a/programs/iexplore/iexplore.rc
+++ b/programs/iexplore/iexplore.rc
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer"
 #define WINE_FILENAME_STR "iexplore.exe"
 #define WINE_FILEVERSION 6,0,2900,2180
 #define WINE_FILEVERSION_STR "6.0.2900.2180"
 #define WINE_PRODUCTVERSION 6,0,2900,2180
 #define WINE_PRODUCTVERSION_STR "6.0.2900.2180"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"