diff --git a/pkgs/applications/audio/bmp-plugins/wma/builder.sh b/pkgs/applications/audio/bmp-plugins/wma/builder.sh
index 686242677a48..c70264d098c4 100644
--- a/pkgs/applications/audio/bmp-plugins/wma/builder.sh
+++ b/pkgs/applications/audio/bmp-plugins/wma/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-makeFlags="-f Makefile.bmp"
+buildFlags="-f Makefile.bmp"
 
 installPhase=installPhase
 installPhase() {
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 35c495a7eb23..a6bfe1f3dae4 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -15,5 +15,5 @@ stdenv.mkDerivation {
   inherit motif;
   buildInputs = [x11 motif libXpm];
 
-  makeFlags = if stdenv.system == "i686-linux" then "linux" else "";
+  buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
 }
diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh
index 06652b081fad..c82d3d9783ea 100644
--- a/pkgs/applications/networking/browsers/mozilla/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla/builder.sh
@@ -48,6 +48,6 @@ postInstall() {
     
 }
 
-makeFlags="-f client.mk build"
+buildFlags="-f client.mk build"
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc-2.95/builder.sh
index 1b71df58807a..cf12872f1c37 100644
--- a/pkgs/development/compilers/gcc-2.95/builder.sh
+++ b/pkgs/development/compilers/gcc-2.95/builder.sh
@@ -68,6 +68,6 @@ preConfigure() {
 }
 
 
-makeFlags="bootstrap"
+buildFlags="bootstrap"
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh
index 9affaa7dceca..0ae93168924b 100644
--- a/pkgs/development/compilers/gcc-3.3/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
@@ -85,6 +85,6 @@ postConfigure() {
 postConfigure=postConfigure
 
 
-makeFlags="bootstrap"
+buildFlags="bootstrap"
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-3.4-arm/builder.sh b/pkgs/development/compilers/gcc-3.4-arm/builder.sh
index be5e9634f7be..fde4aafaecc2 100644
--- a/pkgs/development/compilers/gcc-3.4-arm/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4-arm/builder.sh
@@ -79,9 +79,9 @@ postInstall() {
 
 
 #if test -z "$profiledCompiler"; then
-#    makeFlags="bootstrap"
+#    buildFlags="bootstrap"
 #else    
-#    makeFlags="profiledbootstrap"
+#    buildFlags="profiledbootstrap"
 #fi
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index 17b0e57f2f0b..5a89201377d6 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -69,9 +69,9 @@ postInstall() {
 
 
 if test -z "$profiledCompiler"; then
-    makeFlags="bootstrap $makeFlags"
+    buildFlags="bootstrap $buildFlags"
 else    
-    makeFlags="profiledbootstrap $makeFlags"
+    buildFlags="profiledbootstrap $buildFlags"
 fi
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-4.0-cross/builder.sh b/pkgs/development/compilers/gcc-4.0-cross/builder.sh
index d7de83a9fe37..ef7106d3c4f9 100644
--- a/pkgs/development/compilers/gcc-4.0-cross/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0-cross/builder.sh
@@ -89,9 +89,9 @@ postInstall() {
 
 
 #if test -z "$profiledCompiler"; then
-    #makeFlags="bootstrap"
+    #buildFlags="bootstrap"
 #else    
-    #makeFlags="profiledbootstrap"
+    #buildFlags="profiledbootstrap"
 #fi
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh
index bbdb59394994..ac55321e888e 100644
--- a/pkgs/development/compilers/gcc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0/builder.sh
@@ -92,9 +92,9 @@ postInstall() {
 
 
 if test -z "$profiledCompiler"; then
-    makeFlags="bootstrap"
+    buildFlags="bootstrap"
 else    
-    makeFlags="profiledbootstrap"
+    buildFlags="profiledbootstrap"
 fi
 
 genericBuild
diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh
index 7aaca0c5d6b0..0440bd50f672 100644
--- a/pkgs/development/compilers/gcc-4.1/builder.sh
+++ b/pkgs/development/compilers/gcc-4.1/builder.sh
@@ -75,9 +75,9 @@ postInstall() {
 
 if test -z "$staticCompiler"; then
     if test -z "$profiledCompiler"; then
-        makeFlags="bootstrap $makeFlags"
+        buildFlags="bootstrap $buildFlags"
     else    
-        makeFlags="profiledbootstrap $makeFlags"
+        buildFlags="profiledbootstrap $buildFlags"
     fi
 fi
 
diff --git a/pkgs/development/compilers/ocaml/ocaml-3.08.0.nix b/pkgs/development/compilers/ocaml/ocaml-3.08.0.nix
index 8591f5664b0f..d063fead4a53 100644
--- a/pkgs/development/compilers/ocaml/ocaml-3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/ocaml-3.08.0.nix
@@ -10,6 +10,6 @@ stdenv.mkDerivation {
   configureScript = ./configure-3.08.0;
   dontAddPrefix = "True";
   configureFlags = ["-no-tk" "-x11lib" x11];
-  makeFlags = ["world" "bootstrap" "opt"];
+  buildFlags = ["world" "bootstrap" "opt"];
   checkTarget = ["opt.opt"];
 }
diff --git a/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix b/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
index 5080fb5326c7..e1d18f6b6ee3 100644
--- a/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
+++ b/pkgs/development/compilers/ocaml/ocaml-3.09.1.nix
@@ -10,6 +10,6 @@ stdenv.mkDerivation {
   configureScript = ./configure-3.09.1;
   dontAddPrefix = "True";
   configureFlags = ["-no-tk" "-x11lib" x11];
-  makeFlags = ["world" "bootstrap" "opt"];
+  buildFlags = ["world" "bootstrap" "opt"];
   checkTarget = ["opt.opt"];
 }
diff --git a/pkgs/development/interpreters/lua-4/builder.sh b/pkgs/development/interpreters/lua-4/builder.sh
index 0c19827aea6b..350f67dc9183 100644
--- a/pkgs/development/interpreters/lua-4/builder.sh
+++ b/pkgs/development/interpreters/lua-4/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-makeFlags="all so sobin"
+buildFlags="all so sobin"
 installFlags="INSTALL_ROOT=$out"
 
 genericBuild
diff --git a/pkgs/development/interpreters/lua-5/builder.sh b/pkgs/development/interpreters/lua-5/builder.sh
index 6d1d918d4ceb..28cd2b9fa612 100644
--- a/pkgs/development/interpreters/lua-5/builder.sh
+++ b/pkgs/development/interpreters/lua-5/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-makeFlags="all so sobin"
+buildFlags="all so sobin"
 installFlags="soinstall INSTALL_ROOT=$out"
 
 genericBuild
diff --git a/pkgs/development/libraries/mesa/builder.sh b/pkgs/development/libraries/mesa/builder.sh
index 978bd0f18a08..4be0efd6983d 100644
--- a/pkgs/development/libraries/mesa/builder.sh
+++ b/pkgs/development/libraries/mesa/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-makeFlags="linux-x86"
+buildFlags="linux-x86"
 
 installPhase=installPhase
 installPhase() {
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 99450754c4f8..f62594667334 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     md5 = "a05bed4aa63637052e60690ccde70421";
   };
   buildInputs = [x11 libXaw];
-  makeFlags = "without_doc";
+  buildFlags = "without_doc";
 }
diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh
index 71146cbee4d0..da58762b4342 100644
--- a/pkgs/tools/archivers/zip/builder.sh
+++ b/pkgs/tools/archivers/zip/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-makeFlags="-f unix/Makefile generic"
+buildFlags="-f unix/Makefile generic"
 
 installFlags="-f unix/Makefile prefix=$out INSTALL=cp"