diff --git a/configure b/configure
index 0d4e64f5e6c..4dc93f334dc 100755
--- a/configure
+++ b/configure
@@ -14662,6 +14662,7 @@ wine_fn_config_program lodctr enable_lodctr install
 wine_fn_config_program mshta enable_mshta install
 wine_fn_config_program msiexec enable_msiexec installbin
 wine_fn_config_program net enable_net install
+wine_fn_config_program ngen enable_ngen install
 wine_fn_config_program notepad enable_notepad installbin
 wine_fn_config_program oleview enable_oleview install
 wine_fn_config_program ping enable_ping install
diff --git a/configure.ac b/configure.ac
index 835a128767d..c73de4ee905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2655,6 +2655,7 @@ WINE_CONFIG_PROGRAM(lodctr,install)
 WINE_CONFIG_PROGRAM(mshta,install)
 WINE_CONFIG_PROGRAM(msiexec,installbin)
 WINE_CONFIG_PROGRAM(net,install)
+WINE_CONFIG_PROGRAM(ngen,install)
 WINE_CONFIG_PROGRAM(notepad,installbin)
 WINE_CONFIG_PROGRAM(oleview,install)
 WINE_CONFIG_PROGRAM(ping,install)
diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in
new file mode 100644
index 00000000000..bfdb1240fca
--- /dev/null
+++ b/programs/ngen/Makefile.in
@@ -0,0 +1,13 @@
+EXTRADEFS = -DWINE_NO_UNICODE_MACROS
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ngen.exe
+APPMODE   = -mconsole -municode
+IMPORTS   = kernel32
+
+C_SRCS = \
+	ngen_main.c
+
+@MAKE_PROG_RULES@
diff --git a/programs/ngen/ngen_main.c b/programs/ngen/ngen_main.c
new file mode 100644
index 00000000000..c3793409f8f
--- /dev/null
+++ b/programs/ngen/ngen_main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010 Vincent Povirk for CodeWeavers
+ *
+ * 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(ngen);
+
+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/tools/wine.inf.in b/tools/wine.inf.in
index a0c5b35ef94..53c34615ed3 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2573,6 +2573,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,notepad.exe
 11,,winetest.exe,-
 12,,mountmgr.sys
+10,Microsoft.NET\Framework\v1.1.4322,ngen.exe
+10,Microsoft.NET\Framework\v2.0.50727,ngen.exe
 16422,Internet Explorer,iexplore.exe
 11,,*