diff --git a/configure b/configure
index 4125ac9682e..2228ce3ed47 100755
--- a/configure
+++ b/configure
@@ -1364,6 +1364,7 @@ enable_services
 enable_spoolsv
 enable_start
 enable_svchost
+enable_systeminfo
 enable_taskkill
 enable_tasklist
 enable_taskmgr
@@ -17476,6 +17477,7 @@ wine_fn_config_test programs/services/tests services.exe_test
 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 systeminfo enable_systeminfo 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
diff --git a/configure.ac b/configure.ac
index 6a3dc465c29..240ce294526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3384,6 +3384,7 @@ WINE_CONFIG_TEST(programs/services/tests)
 WINE_CONFIG_PROGRAM(spoolsv,,[install])
 WINE_CONFIG_PROGRAM(start,,[install,po])
 WINE_CONFIG_PROGRAM(svchost,,[install])
+WINE_CONFIG_PROGRAM(systeminfo,,[install])
 WINE_CONFIG_PROGRAM(taskkill,,[install,po])
 WINE_CONFIG_PROGRAM(tasklist,,[install])
 WINE_CONFIG_PROGRAM(taskmgr,,[install,po])
diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in
new file mode 100644
index 00000000000..72e47919cd3
--- /dev/null
+++ b/programs/systeminfo/Makefile.in
@@ -0,0 +1,5 @@
+MODULE    = systeminfo.exe
+APPMODE   = -mconsole -municode
+
+C_SRCS = \
+	main.c
diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c
new file mode 100644
index 00000000000..e7bb30e2e4f
--- /dev/null
+++ b/programs/systeminfo/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 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(systeminfo);
+
+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;
+}