diff --git a/configure b/configure
index a0f9477bb2672ef9a9f2f1a95b054af9682e91fc..ddf79be987cd67b41c0c4165297dcf0d0e90a83d 100755
--- a/configure
+++ b/configure
@@ -16663,6 +16663,7 @@ wine_fn_config_program spoolsv enable_spoolsv install
 wine_fn_config_program start enable_start install,po
 wine_fn_config_program svchost enable_svchost install
 wine_fn_config_program taskkill enable_taskkill install,po
+wine_fn_config_program tasklist enable_tasklist install
 wine_fn_config_program taskmgr enable_taskmgr install,po
 wine_fn_config_program termsv enable_termsv install
 wine_fn_config_program uninstaller enable_uninstaller install,po
diff --git a/configure.ac b/configure.ac
index 0458206907b2f8c61e90fb20bb9e82571b393bc3..1cba660babae7f6216d919b70ae7a24a3b904327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3251,6 +3251,7 @@ WINE_CONFIG_PROGRAM(spoolsv,,[install])
 WINE_CONFIG_PROGRAM(start,,[install,po])
 WINE_CONFIG_PROGRAM(svchost,,[install])
 WINE_CONFIG_PROGRAM(taskkill,,[install,po])
+WINE_CONFIG_PROGRAM(tasklist,,[install])
 WINE_CONFIG_PROGRAM(taskmgr,,[install,po])
 WINE_CONFIG_PROGRAM(termsv,,[install])
 WINE_CONFIG_PROGRAM(uninstaller,,[install,po])
diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..f8c7e47ca53ce1f6517b422549e9fcdf22a2d8f2
--- /dev/null
+++ b/programs/tasklist/Makefile.in
@@ -0,0 +1,8 @@
+MODULE    = tasklist.exe
+APPMODE   = -mconsole -municode
+
+C_SRCS = tasklist.c
+
+RC_SRCS = version.rc
+
+@MAKE_PROG_RULES@
diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c
new file mode 100644
index 0000000000000000000000000000000000000000..a0efa634425a4a48197269aa63182a61002dc33c
--- /dev/null
+++ b/programs/tasklist/tasklist.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 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(tasklist);
+
+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/tasklist/version.rc b/programs/tasklist/version.rc
new file mode 100644
index 0000000000000000000000000000000000000000..d6eecb55df241babf187bad3257e39cc8c7ee42a
--- /dev/null
+++ b/programs/tasklist/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2013 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 "Wine tasklist"
+#define WINE_FILENAME_STR "tasklist.exe"
+#define WINE_FILEVERSION 6,1,7601,16385
+#define WINE_FILEVERSION_STR "6.1.7601.16385"
+#define WINE_PRODUCTVERSION 6,1,7601,16385
+#define WINE_PRODUCTVERSION_STR "6.1.7601.16385"
+
+#include "wine/wine_common_ver.rc"