diff --git a/README.rst b/README.rst
index 2832b4ad3194..f110976ed28b 100644
--- a/README.rst
+++ b/README.rst
@@ -96,6 +96,7 @@ Linux
$ cmake -DBOOST_ROOT=/your_boost_directory \
-DHWLOC_ROOT=/your_hwloc_directory \
+ -DCMAKE_INSTALL_PREFIX=/where_hpx_should_be_installed \
[other CMake variable definitions] \
/path/to/hpx/source/tree
@@ -120,8 +121,12 @@ Linux
to build and install the examples.
-Mac OSX
--------
+OS X (Mac)
+----------
+
+The standard system compiler on OS X is too old to build HPX. You will
+have to install a newer compiler manually, either Clang or GCC. Below
+we describe two possibilities:
1) Install a recent version of LLVM and Clang.
In order to build hpx you will need a fairly recent version of Clang
@@ -198,6 +203,31 @@ Mac OSX
to build and install the examples.
+
+Alternatively, you can install a recent version of gcc as well as all
+required libraries via MacPorts:
+
+1) Install MacPorts
+
+2) Install Boost, CMake, gcc 4.8, and hwloc:
+
+ $ sudo port install boost
+ $ sudo port install gcc48
+ $ sudo port install hwloc
+
+ You may also want:
+
+ $ sudo port install cmake
+ $ sudo port install git-core
+
+3) Make this version of gcc your default compiler:
+
+ $ sudo port install gcc_select
+ $ sudo port select gcc mp-gcc48
+
+4) Build HPX as described above in the ``Linux'' section.
+
+
Windows
-------
diff --git a/docs/tutorial/gettingstarted.qbk b/docs/tutorial/gettingstarted.qbk
index e9356d8a14ff..954278bbb0c6 100644
--- a/docs/tutorial/gettingstarted.qbk
+++ b/docs/tutorial/gettingstarted.qbk
@@ -261,13 +261,17 @@ HPX_MALLOC as this is crucial for getting decent performance.
[endsect] [/ How to Install __hpx__ on Unix Variants]
[/////////////////////////////////////////////////////////////////////////////]
-[section:macos_installation How to Install __hpx__ on MacOS]
+[section:macos_installation How to Install __hpx__ on OS X (Mac)]
-This section describes how to build__hpx__ for Mac OS X (with recent versions
+This section describes how to build__hpx__ for OS X (Mac) (with recent versions
of Clang, libc++, and Boost).
[teletype]
+The standard system compiler on OS X is too old to build HPX. You will
+have to install a newer compiler manually, either Clang or GCC. Below
+we describe two possibilities:
+
[heading Install a recent version of LLVM and Clang]
In order to build __hpx__ you will need a fairly recent version of Clang
@@ -379,6 +383,32 @@ For more detailed information about using __cmake__ please refer its documentati
and to the section __cmake_hpx__ for. Please pay special attention to the section about
HPX_MALLOC as this is crucial for getting decent performance.
+[heading Alternative Installation method of HPX on OS X (Mac)]
+
+Alternatively, you can install a recent version of gcc as well as all
+required libraries via MacPorts:
+
+1) Install MacPorts
+
+2) Install Boost, CMake, gcc 4.8, and hwloc:
+
+ $ sudo port install boost
+ $ sudo port install gcc48
+ $ sudo port install hwloc
+
+ You may also want:
+
+ $ sudo port install cmake
+ $ sudo port install git-core
+
+3) Make this version of gcc your default compiler:
+
+ $ sudo port install gcc_select
+ $ sudo port select gcc mp-gcc48
+
+4) Build HPX as described above in the __unix_installation__ section.
+
+
[c++]
[endsect]