diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index 49ff412b26b3daf07174858dd18e50bc6767b8a6..e1377185c978a157006ab808d81d7764173e88a3 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -77,6 +77,7 @@ QWidget *ProjectExplorerSettingsPage::createPage(QWidget *parent)
     m_ui.jomCheckbox->setChecked(pes.useJom);
 #else
     m_ui.jomCheckbox->setVisible(false);
+    m_ui.jomLabel->setVisible(false);
 #endif
     return w;
 }
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h
index e03eae1062ed45f4039fd4830b5faef0b15c84b9..c73d10c9dffa95d20a08a60445f9c0f24c53f53c 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.h
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.h
@@ -52,7 +52,7 @@ public:
     virtual void apply();
     virtual void finish();
 private:
-    ProjectExplorer::Internal::Ui::ProjetExplorerSettingsPageUi m_ui;
+    Ui::ProjectExplorerSettingsPageUi m_ui;
 };
 
 } // Internal
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index c1028e4712332628512f6bc0a40d9d67f64f08e2..c00c4ff00a9f324d1d94d2f3f272a4fb77a367b9 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ProjectExplorer::Internal::ProjetExplorerSettingsPageUi</class>
- <widget class="QWidget" name="ProjectExplorer::Internal::ProjetExplorerSettingsPageUi">
+ <class>ProjectExplorer::Internal::ProjectExplorerSettingsPageUi</class>
+ <widget class="QWidget" name="ProjectExplorer::Internal::ProjectExplorerSettingsPageUi">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>296</width>
-    <height>249</height>
+    <width>338</width>
+    <height>289</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -16,7 +16,7 @@
      <property name="title">
       <string>Build and Run</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QCheckBox" name="saveAllFilesCheckBox">
         <property name="text">
@@ -39,14 +39,37 @@
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="jomCheckbox">
-        <property name="whatsThis">
-         <string/>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <property name="spacing">
+         <number>0</number>
         </property>
-        <property name="text">
-         <string>Use jom instead of nmake</string>
-        </property>
-       </widget>
+        <item>
+         <widget class="QCheckBox" name="jomCheckbox">
+          <property name="whatsThis">
+           <string/>
+          </property>
+          <property name="text">
+           <string>Use jom instead of nmake</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="jomLabel">
+          <property name="text">
+           <string>jom is a drop-in replacement for nmake which distributes the compilation process to multiple CPU cores. For more details, see &lt;a href=&quot;http://qt.gitorious.org/qt-labs/jom/&quot;&gt;the jom Homepage&lt;/a&gt;. Disable this if you expirience problems with your Makefiles.</string>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+          <property name="indent">
+           <number>20</number>
+          </property>
+          <property name="openExternalLinks">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>