diff --git a/ChangeLog b/ChangeLog
index 938f22d..105dbf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-17  Justin Davis  <juster@cpan.org>
+
+	* lib/CPANPLUS/Dist/Arch.pm: Fix bug where installing packages
+	from the AUR runs Module::AutoInstall inside the PKGBUILD.
+	Module::AutoInstall installed packages while running _inside_ the
+	PKGBUILD.  Maybe all AUR packages created by cpan2aur who used
+	Module::Install were broken!  Reported by Xenoterracide
+
 2010-04-13  Justin Davis  <juster@cpan.org>
 
 	* lib/CPANPLUS/Dist/Arch.pm (create): Fix bug where I assumed
diff --git a/lib/CPANPLUS/Dist/Arch.pm b/lib/CPANPLUS/Dist/Arch.pm
index 9b81765..93bcef9 100644
--- a/lib/CPANPLUS/Dist/Arch.pm
+++ b/lib/CPANPLUS/Dist/Arch.pm
@@ -101,7 +101,7 @@ md5sums=('[% md5sums %]')
 
 build() {
   DIST_DIR="${srcdir}/[% distdir %]"
-  export PERL_MM_USE_DEFAULT=1
+  export PERL_AUTOINSTALL=--skipdeps PERL_MM_USE_DEFAULT=1
   { cd "$DIST_DIR" &&
 [% IF is_makemaker %]
     perl Makefile.PL INSTALLDIRS=vendor &&