diff --git a/README.md b/README.md
index acca6be9..5398b3c8 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,10 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [11]:**
+**Bugfixes and features included in the next upcoming release [12]:**
 
 * Add stub for PowerCreateRequest
+* Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry ([Wine Bug #29842](https://bugs.winehq.org/show_bug.cgi?id=29842))
 * Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
 * Fix wrong version of ID3DXEffect interface for d3dx9_24
diff --git a/debian/changelog b/debian/changelog
index 7327b434..ec47a1ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ wine-staging (1.7.39) UNRELEASED; urgency=low
   * Added patch to only zero the buffer up 32767 bytes in GetTempPathW.
   * Added patch to implement shared memory wineserver communication for various user32 functions.
   * Added patch to implement combase.WindowsSubstring function.
+  * Added patch with stub for wininet.ParseX509EncodedCertificateForListBoxEntry.
   * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream).
   * Removed patches for SLGetWindowsInformationDWORD (accepted upstream).
   * Removed patches for _ismbckata and _mbctohira (fixed upstream).
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 00410692..6b3652bf 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -226,6 +226,7 @@ patch_enable_all ()
 	enable_winex11_Window_Style="$1"
 	enable_winex11_XEMBED="$1"
 	enable_winex11_wglShareLists="$1"
+	enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
 	enable_winmm_Delay_Import_Depends="$1"
 	enable_wpcap_Dynamic_Linking="$1"
 	enable_ws2_32_APC_Performance="$1"
@@ -732,6 +733,9 @@ patch_enable ()
 		winex11-wglShareLists)
 			enable_winex11_wglShareLists="$2"
 			;;
+		wininet-ParseX509EncodedCertificateForListBoxEntry)
+			enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$2"
+			;;
 		winmm-Delay_Import_Depends)
 			enable_winmm_Delay_Import_Depends="$2"
 			;;
@@ -4469,6 +4473,21 @@ if test "$enable_winex11_wglShareLists" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wininet-ParseX509EncodedCertificateForListBoxEntry
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#29842] Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry
+# |
+# | Modified files:
+# |   *	dlls/wininet/dialogs.c, dlls/wininet/wininet.spec, include/winineti.h
+# |
+if test "$enable_wininet_ParseX509EncodedCertificateForListBoxEntry" -eq 1; then
+	patch_apply wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch
+	(
+		echo '+    { "Austin English", "wininet: add ParseX509EncodedCertificateForListBoxEntry stub.", 2 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winmm-Delay_Import_Depends
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch b/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch
new file mode 100644
index 00000000..3769a7dd
--- /dev/null
+++ b/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/0001-wininet-add-ParseX509EncodedCertificateForListBoxEnt.patch
@@ -0,0 +1,61 @@
+From db29dec04c5c02ab2a96010d42aec00aaeccbec2 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Wed, 25 Feb 2015 01:04:56 -0600
+Subject: wininet: add ParseX509EncodedCertificateForListBoxEntry stub (try 2)
+
+Try 2: Fix prototype/spec file, add to winineti.h
+Fixes https://bugs.winehq.org/show_bug.cgi?id=29842
+---
+ dlls/wininet/dialogs.c    | 9 +++++++++
+ dlls/wininet/wininet.spec | 2 +-
+ include/winineti.h        | 1 +
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
+index bf4121b..46b876e 100644
+--- a/dlls/wininet/dialogs.c
++++ b/dlls/wininet/dialogs.c
+@@ -576,6 +576,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window)
+ }
+ 
+ /***********************************************************************
++ *           ParseX509EncodedCertificateForListBoxEntry (@)
++ */
++DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox)
++{
++   FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox);
++   return ERROR_CALL_NOT_IMPLEMENTED;
++}
++
++/***********************************************************************
+  *           ShowX509EncodedCertificate (@)
+  */
+ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len)
+diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
+index 3c4bf5a..c4bf442 100644
+--- a/dlls/wininet/wininet.spec
++++ b/dlls/wininet/wininet.spec
+@@ -216,7 +216,7 @@
+ @ stdcall IsUrlCacheEntryExpiredA(str long ptr)
+ @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr)
+ @ stdcall LoadUrlCacheContent()
+-@ stub ParseX509EncodedCertificateForListBoxEntry
++@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr)
+ @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr)
+ @ stdcall PrivacySetZonePreferenceW(long long long wstr)
+ @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long)
+diff --git a/include/winineti.h b/include/winineti.h
+index 5b6f15f..5e38424 100644
+--- a/include/winineti.h
++++ b/include/winineti.h
+@@ -120,6 +120,7 @@ BOOL        WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR);
+ BOOL        WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*);
+ BOOL        WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*);
+ #define     IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired)
++DWORD       WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD);
+ BOOL        WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD);
+ BOOL        WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD);
+ #define     SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo)
+-- 
+2.3.2
+
diff --git a/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/definition b/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/definition
new file mode 100644
index 00000000..70126e23
--- /dev/null
+++ b/patches/wininet-ParseX509EncodedCertificateForListBoxEntry/definition
@@ -0,0 +1 @@
+Fixes: [29842] Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry