diff --git a/configure b/configure
index 3af68ca71c9..032ba6811c2 100755
--- a/configure
+++ b/configure
@@ -1716,6 +1716,7 @@ enable_aspnet_regiis
 enable_attrib
 enable_cabarc
 enable_cacls
+enable_chcp_com
 enable_clock
 enable_cmd
 enable_conhost
@@ -21089,6 +21090,7 @@ wine_fn_config_makefile programs/aspnet_regiis enable_aspnet_regiis
 wine_fn_config_makefile programs/attrib enable_attrib
 wine_fn_config_makefile programs/cabarc enable_cabarc
 wine_fn_config_makefile programs/cacls enable_cacls
+wine_fn_config_makefile programs/chcp.com enable_chcp_com
 wine_fn_config_makefile programs/clock enable_clock
 wine_fn_config_makefile programs/cmd enable_cmd
 wine_fn_config_makefile programs/cmd/tests enable_tests
diff --git a/configure.ac b/configure.ac
index a3bece9e8a7..7fc85841caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/aspnet_regiis)
 WINE_CONFIG_MAKEFILE(programs/attrib)
 WINE_CONFIG_MAKEFILE(programs/cabarc)
 WINE_CONFIG_MAKEFILE(programs/cacls)
+WINE_CONFIG_MAKEFILE(programs/chcp.com)
 WINE_CONFIG_MAKEFILE(programs/clock)
 WINE_CONFIG_MAKEFILE(programs/cmd)
 WINE_CONFIG_MAKEFILE(programs/cmd/tests)
diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in
new file mode 100644
index 00000000000..3f763bbcd73
--- /dev/null
+++ b/programs/chcp.com/Makefile.in
@@ -0,0 +1,6 @@
+MODULE    = chcp.com
+
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+
+C_SRCS = \
+	main.c
diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c
new file mode 100644
index 00000000000..0a38b7a8f35
--- /dev/null
+++ b/programs/chcp.com/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 Erich E. Hoover
+ *
+ * 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(chcp);
+
+int __cdecl 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;
+}