diff --git a/README.md b/README.md
index 3b675c97..e18fcfc8 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,12 @@ Wine. All those differences are also documented on the
 Included bugfixes and improvements
 ==================================
 
-**Bugfixes and features included in the next upcoming release [4]:**
+**Bugfixes and features included in the next upcoming release [5]:**
 
 * Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652))
 * Support for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW
+* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](http://bugs.winehq.org/show_bug.cgi?id=36964))
 * Update a XIM candidate position when cursor location changes ([Wine Bug #30938](http://bugs.winehq.org/show_bug.cgi?id=30938))
 
 
diff --git a/patches/Makefile b/patches/Makefile
index 9f63de86..1f8f806f 100644
--- a/patches/Makefile
+++ b/patches/Makefile
@@ -68,6 +68,7 @@ PATCHLIST := \
 	user32-GetSystemMetrics.ok \
 	user32-GetTipText.ok \
 	user32-WndProc.ok \
+	wine.inf-ProductId.ok \
 	wineboot-HKEY_DYN_DATA.ok \
 	winebuild-LinkerVersion.ok \
 	wined3d-DXTn.ok \
@@ -1089,6 +1090,24 @@ user32-WndProc.ok:
 		echo '+    { "user32-WndProc", "Sebastian Lackner", "Workaround for programs leaking wndproc splots." },'; \
 	) > user32-WndProc.ok
 
+# Patchset wine.inf-ProductId
+# |
+# | Included patches:
+# |   *	wine.inf: Add fake ProductId to HKLM\CurrentVersionNT. [by Yanis Lukes]
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#36964] Unity3D Editor requires ProductId registry value
+# |
+# | Modified files:
+# |   *	loader/wine.inf.in
+# |
+.INTERMEDIATE: wine.inf-ProductId.ok
+wine.inf-ProductId.ok:
+	$(call APPLY_FILE,wine.inf-ProductId/0001-wine.inf-Add-fake-ProductId-to-HKLM-CurrentVersionNT.patch)
+	@( \
+		echo '+    { "wine.inf-ProductId", "Yanis Lukes", "wine.inf: Add fake ProductId to HKLM\\\\CurrentVersionNT." },'; \
+	) > wine.inf-ProductId.ok
+
 # Patchset wineboot-HKEY_DYN_DATA
 # |
 # | Included patches:
diff --git a/patches/wine.inf-ProductId/0001-wine.inf-Add-fake-ProductId-to-HKLM-CurrentVersionNT.patch b/patches/wine.inf-ProductId/0001-wine.inf-Add-fake-ProductId-to-HKLM-CurrentVersionNT.patch
new file mode 100644
index 00000000..3c95eb88
--- /dev/null
+++ b/patches/wine.inf-ProductId/0001-wine.inf-Add-fake-ProductId-to-HKLM-CurrentVersionNT.patch
@@ -0,0 +1,24 @@
+From 992dbbf53f5c8d372fcc211e6b3205ec2e096489 Mon Sep 17 00:00:00 2001
+From: Yanis Lukes <Pendrokar@gmail.com>
+Date: Sun, 28 Sep 2014 17:04:45 +0200
+Subject: wine.inf: Add fake ProductId to HKLM\CurrentVersionNT.
+
+---
+ loader/wine.inf.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index 42a750e..64947c8 100644
+--- a/loader/wine.inf.in
++++ b/loader/wine.inf.in
+@@ -468,6 +468,7 @@ HKLM,%CurrentVersion%\Uninstall,,16
+ HKCU,%CurrentVersion%\Run,,16
+ HKLM,%CurrentVersion%\Run,,16
+ HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354
++HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321"
+ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,""
+ HKLM,%CurrentVersionNT%,"RegisteredOwner",2,""
+ HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"
+-- 
+1.9.1
+
diff --git a/patches/wine.inf-ProductId/definition b/patches/wine.inf-ProductId/definition
new file mode 100644
index 00000000..3b0aeb67
--- /dev/null
+++ b/patches/wine.inf-ProductId/definition
@@ -0,0 +1,4 @@
+Author: Yanis Lukes
+Subject: wine.inf: Add fake ProductId to HKLM\CurrentVersionNT.
+Revision: 1
+Fixes: [36964] Unity3D Editor requires ProductId registry value