diff --git a/config/software/git.rb b/config/software/git.rb
index bd4cf1c..cb5b9be 100644
--- a/config/software/git.rb
+++ b/config/software/git.rb
@@ -14,11 +14,6 @@ env = {
   "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
   "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
   "LD_RUN_PATH" => "#{install_dir}/embedded/lib",
-  "NO_PERL" => "YesPlease",
-  "NO_EXPAT" => "YesPlease",
-  "NO_TCLTK" => "YesPlease",
-  "NO_GETTEXT" => "YesPlease",
-  "NO_PYTHON" => "YesPlease"
 }
 
 build do
@@ -28,6 +23,19 @@ build do
            "--with-ssl=#{install_dir}/embedded",
            "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env
 
+  # Ugly hack because ./configure does not pick these up from the env
+  block do
+    open(File.join(project_dir, "config.mak.autogen"), "a") do |file|
+      file.print <<-EOH
+NO_PERL=YesPlease
+NO_EXPAT=YesPlease
+NO_TCLTK=YesPlease
+NO_GETTEXT=YesPlease
+NO_PYTHON=YesPlease
+      EOH
+    end
+  end
+
   command "make -j #{max_build_jobs}", :env => env
   command "make install"
 end
--
libgit2 0.21.2