diff --git a/configure b/configure
index 907dbe04a16..844dde5dfae 100755
--- a/configure
+++ b/configure
@@ -14905,6 +14905,7 @@ wine_fn_config_program extrac32 enable_extrac32 install
 wine_fn_config_program hh enable_hh install
 wine_fn_config_program icinfo enable_icinfo install
 wine_fn_config_program iexplore enable_iexplore install
+wine_fn_config_program ipconfig enable_ipconfig install
 wine_fn_config_program lodctr enable_lodctr install
 wine_fn_config_program mshta enable_mshta install
 wine_fn_config_program msiexec enable_msiexec installbin
diff --git a/configure.ac b/configure.ac
index 0f61046511a..982e6f6f512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2744,6 +2744,7 @@ WINE_CONFIG_PROGRAM(extrac32,install)
 WINE_CONFIG_PROGRAM(hh,install)
 WINE_CONFIG_PROGRAM(icinfo,install)
 WINE_CONFIG_PROGRAM(iexplore,install)
+WINE_CONFIG_PROGRAM(ipconfig,install)
 WINE_CONFIG_PROGRAM(lodctr,install)
 WINE_CONFIG_PROGRAM(mshta,install)
 WINE_CONFIG_PROGRAM(msiexec,installbin)
diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in
new file mode 100644
index 00000000000..0cd8ce65c9b
--- /dev/null
+++ b/programs/ipconfig/Makefile.in
@@ -0,0 +1,11 @@
+EXTRADEFS = -DWINE_NO_UNICODE_MACROS
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ipconfig.exe
+APPMODE   = -mconsole -municode
+
+C_SRCS = ipconfig.c
+
+@MAKE_PROG_RULES@
diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c
new file mode 100644
index 00000000000..fc5d95c1b91
--- /dev/null
+++ b/programs/ipconfig/ipconfig.c
@@ -0,0 +1,31 @@
+/*
+ * IP configuration utility
+ *
+ * Copyright 2010 Andrew Nguyen
+ *
+ * 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 <windows.h>
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(ipconfig);
+
+int wmain(int argc, WCHAR *argv[])
+{
+    WINE_FIXME("ipconfig.exe is not implemented\n");
+    return 0;
+}