diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake
index 05660659c..7a7adc481 100755
--- a/uppbox/Scripts/domake
+++ b/uppbox/Scripts/domake
@@ -372,6 +372,13 @@ else
 
 fi
 
+if [ "$platform" = "Darwin" ]
+then
+ log_debug_info "Adjusting Makefile/uMakefile for Mac OS X"
+ sed -i -E -e 's/(-Wl,[^[:space:]]*)//g' uppsrc/Makefile
+ sed -i -E -e 's/(-Wl,[^[:space:]]*)//g' uppsrc/uMakefile
+fi
+
 if [ ! -f /usr/lib/libdl.so -a ! -f /usr/lib64/libdl.so ]
 then
   sed -i -e s/-ldl//g uppsrc/Makefile
diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src
index ae9ad9505..c085145d9 100644
--- a/uppbox/Scripts/src
+++ b/uppbox/Scripts/src
@@ -18,14 +18,10 @@ cp -p ~/Scripts/GCCMK.bm ~/.upp/theide
 ~/bin/umk ~/upp.src/uppsrc ide GCCMK -asrXk ~/upp.tmp/upp/uppsrc
 
 mv ~/upp.tmp/upp/uppsrc/Makefile ~/upp.tmp/upp/uppsrc/Makefile.in
-# remove linker optimisation option because we are building an executable: "-Wl,-O,2"
-sed -i -e 's| -Wl,-O,2||g' ~/upp.tmp/upp/uppsrc/Makefile.in
 
 ~/bin/umk ~/upp.src/uppsrc umk GCCMK -asrXk ~/upp.tmp/upp/uppsrc
 
 mv ~/upp.tmp/upp/uppsrc/Makefile ~/upp.tmp/upp/uppsrc/uMakefile.in
-# remove linker optimisation option because we are building an executable: "-Wl,-O,2"
-sed -i -e 's| -Wl,-O,2||g' ~/upp.tmp/upp/uppsrc/uMakefile.in
 
 cp -p ~/Scripts/Makefile ~/upp.tmp/upp
 cp -p ~/Scripts/domake ~/upp.tmp/upp