diff --git a/configure b/configure
index e529bf3ac3a..e52c4f0ee06 100755
--- a/configure
+++ b/configure
@@ -15962,6 +15962,7 @@ wine_fn_config_program cacls enable_cacls install
 wine_fn_config_program clock enable_clock install,po
 wine_fn_config_program cmd enable_cmd install,po
 wine_fn_config_test programs/cmd/tests cmd.exe_test
+wine_fn_config_program conhost enable_conhost install
 wine_fn_config_program control enable_control install
 wine_fn_config_program cscript enable_cscript install
 wine_fn_config_program dxdiag enable_dxdiag install,po
diff --git a/configure.ac b/configure.ac
index 05f03b5a0c9..c06e108131f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3137,6 +3137,7 @@ WINE_CONFIG_PROGRAM(cacls,,[install])
 WINE_CONFIG_PROGRAM(clock,,[install,po])
 WINE_CONFIG_PROGRAM(cmd,,[install,po])
 WINE_CONFIG_TEST(programs/cmd/tests)
+WINE_CONFIG_PROGRAM(conhost,,[install])
 WINE_CONFIG_PROGRAM(control,,[install])
 WINE_CONFIG_PROGRAM(cscript,,[install])
 WINE_CONFIG_PROGRAM(dxdiag,,[install,po])
diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in
new file mode 100644
index 00000000000..21c08388c33
--- /dev/null
+++ b/programs/conhost/Makefile.in
@@ -0,0 +1,8 @@
+MODULE    = conhost.exe
+APPMODE   = -mconsole -municode
+
+C_SRCS = conhost.c
+
+RC_SRCS = version.rc
+
+@MAKE_PROG_RULES@
diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c
new file mode 100644
index 00000000000..3ef40baeb86
--- /dev/null
+++ b/programs/conhost/conhost.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2012 Detlef Riekenberg
+ *
+ * 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(conhost);
+
+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/conhost/version.rc b/programs/conhost/version.rc
new file mode 100644
index 00000000000..2ad26115ccd
--- /dev/null
+++ b/programs/conhost/version.rc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012 Detlef Riekenberg
+ *
+ * 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 conhost"
+#define WINE_FILENAME_STR "conhost.exe"
+#define WINE_FILEVERSION 6,1,7601,22045
+#define WINE_FILEVERSION_STR "6.1.7601.22045"
+#define WINE_PRODUCTVERSION 6,1,7601,22045
+#define WINE_PRODUCTVERSION_STR "6.1.7601.22045"
+
+#include "wine/wine_common_ver.rc"