diff --git a/Makefile.am b/Makefile.am
index 8fa2eaf7a3..18779f2284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,7 @@ EXTRA_DIST = \
   scripts/check-symfile.py \
   scripts/check-symsorting.py \
   scripts/dtrace2systemtap.py \
+  scripts/esx_vi_generator.py \
   scripts/genpolkit.py \
   scripts/gensystemtap.py \
   scripts/header-ifdef.py \
diff --git a/src/esx/esx_vi_generator.py b/scripts/esx_vi_generator.py
similarity index 100%
rename from src/esx/esx_vi_generator.py
rename to scripts/esx_vi_generator.py
diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am
index 78b80dfddf..d53cef1515 100644
--- a/src/esx/Makefile.inc.am
+++ b/src/esx/Makefile.inc.am
@@ -43,7 +43,6 @@ ESX_DRIVER_GENERATED = \
 ESX_DRIVER_EXTRA_DIST = \
 	esx/README \
 	esx/esx_vi_generator.input \
-	esx/esx_vi_generator.py \
 	$(NULL)
 
 ESX_GENERATED_STAMP = .esx_vi_generator.stamp
@@ -60,9 +59,10 @@ BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
 $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP)
 
 $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
-                         $(srcdir)/esx/esx_vi_generator.py
+                         $(top_srcdir)/scripts/esx_vi_generator.py
 	$(AM_V_GEN) $(RUNUTF8) $(PYTHON) \
-		$(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@
+		$(top_srcdir)/scripts/esx_vi_generator.py \
+		$(srcdir) $(builddir) && touch $@
 
 CLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)