diff --git a/dist/changes-2.5.0 b/dist/changes-2.5.0
index 6f87cdd6c89a2179eb4a2cb245a82da1462a2bd6..f3c765be2f09c225a8df8edb43c3d4342bf2f5c8 100644
--- a/dist/changes-2.5.0
+++ b/dist/changes-2.5.0
@@ -59,6 +59,7 @@ Help
 Platform Specific
 
 Mac
+   * Pass architecture and bit width from the tool chain build setting to Qmake (QTCREATORBUG-6088)
 
 Linux (GNOME and KDE)
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index bd86f82bd41f6d16678cb463a57f47522b6b8a56..bd208cacf8b0aa2148e77d5d2cc86f58ae437c5e 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -166,19 +166,37 @@ QString QMakeStep::allArguments(bool shorted)
 ///
 /// moreArguments,
 /// -unix for Maemo
-/// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR
 /// QMAKE_VAR_QMLJSDEBUGGER_PATH
 QStringList QMakeStep::moreArguments()
 {
     Qt4BuildConfiguration *bc = qt4BuildConfiguration();
     QStringList arguments;
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     ProjectExplorer::ToolChain *tc = bc->toolChain();
-    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
-               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
+    ProjectExplorer::Abi targetAbi;
+    if (tc)
+        targetAbi = tc->targetAbi();
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+    if ((targetAbi.osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
+               || targetAbi.osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
         arguments << QLatin1String("-unix");
 #endif
 
+    // explicitly add architecture to CONFIG
+    if ((targetAbi.os() == ProjectExplorer::Abi::MacOS)
+            && (targetAbi.binaryFormat() == ProjectExplorer::Abi::MachOFormat)) {
+        if (targetAbi.architecture() == ProjectExplorer::Abi::X86Architecture) {
+            if (targetAbi.wordWidth() == 32)
+                arguments << QLatin1String("CONFIG+=x86");
+            else if (targetAbi.wordWidth() == 64)
+                arguments << QLatin1String("CONFIG+=x86_64");
+        } else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) {
+            if (targetAbi.wordWidth() == 32)
+                arguments << QLatin1String("CONFIG+=ppc");
+            else if (targetAbi.wordWidth() == 64)
+                arguments << QLatin1String("CONFIG+=ppc64");
+        }
+    }
+
     if (linkQmlDebuggingLibrary() && bc->qtVersion()) {
         if (!bc->qtVersion()->needsQmlDebuggingLibrary()) {
             // This Qt version has the QML debugging services built in, however
@@ -201,6 +219,7 @@ QStringList QMakeStep::moreArguments()
     return arguments;
 }
 
+/// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR
 QStringList QMakeStep::moreArgumentsAfter()
 {
     Qt4BuildConfiguration *bc = qt4BuildConfiguration();