diff --git a/configure b/configure
index 35705f56b3d..71610773511 100755
--- a/configure
+++ b/configure
@@ -1485,6 +1485,7 @@ enable_winetest
 enable_winhlp32
 enable_winver
 enable_wmic
+enable_wmplayer
 enable_wordpad
 enable_write
 enable_wscript
@@ -18225,6 +18226,7 @@ wine_fn_config_program winhlp32 enable_winhlp32 install,po
 wine_fn_config_program winoldap.mod16 enable_win16 install
 wine_fn_config_program winver enable_winver install
 wine_fn_config_program wmic enable_wmic install,po
+wine_fn_config_program wmplayer enable_wmplayer install
 wine_fn_config_program wordpad enable_wordpad install,po
 wine_fn_config_program write enable_write install,po
 wine_fn_config_program wscript enable_wscript clean,install
diff --git a/configure.ac b/configure.ac
index c6a8b3e2a6a..84420a90e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3581,6 +3581,7 @@ WINE_CONFIG_PROGRAM(winhlp32,,[install,po])
 WINE_CONFIG_PROGRAM(winoldap.mod16,enable_win16,[install])
 WINE_CONFIG_PROGRAM(winver,,[install])
 WINE_CONFIG_PROGRAM(wmic,,[install,po])
+WINE_CONFIG_PROGRAM(wmplayer,,[install])
 WINE_CONFIG_PROGRAM(wordpad,,[install,po])
 WINE_CONFIG_PROGRAM(write,,[install,po])
 WINE_CONFIG_PROGRAM(wscript,,[clean,install])
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index b6b1e00b855..343bc6adf39 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,msxml6.dll
 11,,shdocvw.dll
 16422,Internet Explorer,iexplore.exe
+16422,Windows Media Player,wmplayer.exe
 11,,*
 
 [FakeDlls]
@@ -2567,6 +2568,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 16410,Microsoft,
 16412,Microsoft,
 16422,Internet Explorer,iexplore.exe
+16422,Windows Media Player,wmplayer.exe
 16427,System\OLE DB,oledb32.dll
 16427,System\OLE DB,msdaps.dll
 11,,*
diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in
new file mode 100644
index 00000000000..be345a0877c
--- /dev/null
+++ b/programs/wmplayer/Makefile.in
@@ -0,0 +1,7 @@
+MODULE    = wmplayer.exe
+APPMODE   = -mwindows -municode
+
+RC_SRCS = version.rc
+
+C_SRCS = \
+	main.c
diff --git a/programs/wmplayer/main.c b/programs/wmplayer/main.c
new file mode 100644
index 00000000000..899835f41a0
--- /dev/null
+++ b/programs/wmplayer/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Austin English
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wmplayer);
+
+int wmain(int argc, WCHAR *argv[])
+{
+    int i;
+
+    WINE_FIXME("stub:");
+    for (i = 0; i < argc; i++)
+        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
+    WINE_FIXME("\n");
+
+    return 0;
+}
diff --git a/programs/wmplayer/version.rc b/programs/wmplayer/version.rc
new file mode 100644
index 00000000000..4e29aac43c0
--- /dev/null
+++ b/programs/wmplayer/version.rc
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 Austin English
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Windows Media Player"
+#define WINE_FILENAME_STR "wmplayer.exe"
+#define WINE_FILETYPE VFT_APP
+#define WINE_FILEVERSION 12,0,7601,18840
+#define WINE_FILEVERSION_STR "12.0.7601.18840"
+#define WINE_PRODUCTVERSION 12,0,7601,18840
+#define WINE_PRODUCTVERSION_STR "12.0.7601.18840"
+
+#include "wine/wine_common_ver.rc"