diff --git a/bash_shared_mapping/bash_shared_mapping.py b/bash_shared_mapping/bash_shared_mapping.py
index e8f604f34..72031fac3 100644
--- a/bash_shared_mapping/bash_shared_mapping.py
+++ b/bash_shared_mapping/bash_shared_mapping.py
@@ -10,6 +10,7 @@ def setup(self, tarball = 'ext3-tools.tar.gz'):
         utils.extract_tarball_to_dir(self.tarball, self.srcdir)
 
         os.chdir(self.srcdir)
+        utils.system('patch -p1 < ../makefile.patch')
         utils.make('bash-shared-mapping usemem')
 
 
diff --git a/fsfuzzer/fsfuzzer.py b/fsfuzzer/fsfuzzer.py
index ca67f846c..b0097b923 100644
--- a/fsfuzzer/fsfuzzer.py
+++ b/fsfuzzer/fsfuzzer.py
@@ -14,7 +14,7 @@ def setup(self, tarball = 'fsfuzzer-0.6.tar.gz'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
-
+        utils.system('patch -p1 < ../makefile.patch')
         utils.make()
 
 
diff --git a/fsstress/fsstress.py b/fsstress/fsstress.py
index f6dedefe2..2d48946e1 100644
--- a/fsstress/fsstress.py
+++ b/fsstress/fsstress.py
@@ -16,6 +16,7 @@ def setup(self, tarball = 'ext3-tools.tar.gz'):
 
         os.chdir(self.srcdir)
         utils.system('patch -p1 < ../fsstress-ltp.patch')
+        utils.system('patch -p1 < ../makefile.patch')
         utils.make('fsstress')
 
 
diff --git a/interbench/interbench.py b/interbench/interbench.py
index a32d5f2a0..ffee90be1 100644
--- a/interbench/interbench.py
+++ b/interbench/interbench.py
@@ -14,6 +14,7 @@ def setup(self, tarball = 'interbench-0.30.tar.bz2'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
+        utils.system('patch -p1 < ../makefile.patch')
         utils.make()
 
 
diff --git a/iozone/iozone.py b/iozone/iozone.py
index 4fbec26a6..2b9cbb516 100644
--- a/iozone/iozone.py
+++ b/iozone/iozone.py
@@ -34,6 +34,7 @@ def setup(self, tarball='iozone3_347.tar'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(os.path.join(self.srcdir, 'src/current'))
+        utils.system('patch -p3 < ../../../makefile.patch')
 
         arch = utils.get_current_kernel_arch()
         if (arch == 'ppc'):
diff --git a/linus_stress/linus_stress.py b/linus_stress/linus_stress.py
index 7ea4d98c4..1e808b047 100644
--- a/linus_stress/linus_stress.py
+++ b/linus_stress/linus_stress.py
@@ -10,7 +10,7 @@ def setup(self):
         os.chdir(self.bindir)
         utils.system('cp linus_stress.c src/')
         os.chdir(self.srcdir)
-        utils.system('cc linus_stress.c -D_POSIX_C_SOURCE=200112 -o linus_stress')
+        utils.system(utils.get_cc() + ' linus_stress.c -D_POSIX_C_SOURCE=200112 -o linus_stress')
 
 
     def initialize(self):
diff --git a/lmbench/lmbench.py b/lmbench/lmbench.py
index 088325826..f93c31630 100644
--- a/lmbench/lmbench.py
+++ b/lmbench/lmbench.py
@@ -30,8 +30,10 @@ def setup(self, tarball = 'lmbench3.tar.bz2', fsdir=None, file=None):
         os.chdir(self.srcdir)
         p1 = 'patch -p1 < ../0001-Fix-build-issues-with-lmbench.patch'
         p2 = 'patch -p1 < ../0002-Changing-shebangs-on-lmbench-scripts.patch'
+        p3 = 'patch -p1 < ../0003-makefile.patch'
         utils.system(p1)
         utils.system(p2)
+        utils.system(p3)
 
         # build lmbench
         utils.make()
diff --git a/memory_api/memory_api.py b/memory_api/memory_api.py
index 71ad5424e..ac9cc3728 100644
--- a/memory_api/memory_api.py
+++ b/memory_api/memory_api.py
@@ -6,11 +6,14 @@ class memory_api(test.test):
     version = 1
 
     def setup(self):
-        utils.system("gcc %s -o %s" %
-                      (os.path.join(self.bindir, "memory_api.c"),
+        os.mkdir(self.tmpdir)
+        utils.system("%s %s -o %s" %
+                      (utils.get_cc(),
+                       os.path.join(self.bindir, "memory_api.c"),
                        os.path.join(self.tmpdir, "memory_api")))
-        utils.system("gcc %s -o %s" %
-                      (os.path.join(self.bindir, "mremaps.c"),
+        utils.system("%s %s -o %s" %
+                      (utils.get_cc(),
+                       os.path.join(self.bindir, "mremaps.c"),
                        os.path.join(self.tmpdir, "mremaps")))
 
 
diff --git a/rmaptest/rmaptest.py b/rmaptest/rmaptest.py
index ee4befb1a..ca2e8306b 100644
--- a/rmaptest/rmaptest.py
+++ b/rmaptest/rmaptest.py
@@ -21,7 +21,7 @@ def initialize(self):
 
     def setup(self):
         os.chdir(self.srcdir)
-        utils.system('gcc -Wall -o rmaptest rmap-test.c')
+        utils.system(utils.get_cc() + ' -Wall -o rmaptest rmap-test.c')
 
 
     def execute(self, args = ''):
diff --git a/signaltest/src/Makefile b/signaltest/src/Makefile
index c91b72f11..da81b33ca 100644
--- a/signaltest/src/Makefile
+++ b/signaltest/src/Makefile
@@ -1,11 +1,10 @@
-
-TARGET=signaltest
-FLAGS= -Wall -O2 
+CC ?= $(CROSS_COMPILE)gcc
+TARGET = signaltest
+FLAGS = -Wall -O2
 LIBS = -lpthread -lrt
 
 all: signaltest.c
-	$(CROSS_COMPILE)gcc $(FLAGS) $^ -o $(TARGET) $(LIBS)
+	$(CC) $(FLAGS) $^ -o $(TARGET) $(LIBS)
 
 clean:
 	rm -f $(TARGET) *.o .depend *.*~
-
diff --git a/tiobench/tiobench.py b/tiobench/tiobench.py
index 747fc26e3..f249509b2 100644
--- a/tiobench/tiobench.py
+++ b/tiobench/tiobench.py
@@ -10,7 +10,7 @@ def setup(self, tarball = 'tiobench-0.3.3.tar.bz2'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
-
+        utils.system('patch -p1 < ../makefile.patch')
         utils.system('make')