diff --git a/build.sh b/build.sh
index 0919c0b..77ec15c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# qt4-default qt4-qmake
-qmake-qt4
+# Install qt4-default qt4-qmake
+# On Mac, install it from http://qt-project.org/downloads
+
+unamestr=$(uname)
+
+if [[ $unamestr == "Darwin" ]]; then
+    MAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.7
+    QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.7
+    export MAKE_CFLAGS_X86_64
+    export QMAKE_CFLAGS_PPC_64
+    export QMAKESPEC=macx-g++
+    #export QMAKESPEC=macx-xcode
+    qmake
+elif [[ $unamestr == "linux" ]]; then
+    qmake-qt4
+fi
+
 make
 lrelease mapmap_fr.ts
+
diff --git a/mapmap.pro b/mapmap.pro
index e5f3f74..3a75a3b 100644
--- a/mapmap.pro
+++ b/mapmap.pro
@@ -72,12 +72,15 @@ unix:!mac {
 # Mac OS X-specific:
 mac {
   DEFINES += MACOSX
-  INCLUDEPATH += /opt/local/include/ \
+  INCLUDEPATH += \
+    /opt/local/include/ \
     /opt/local/include/libxml2
   LIBS += -L/opt/local/lib \
-    -lGLEW
     -framework OpenGL \
     -framework GLUT
   QMAKE_CXXFLAGS += -D__MACOSX_CORE__
+  QMAKE_CXXFLAGS += -stdlib=libstdc++
+
+  #  -lGLEW
 }