diff --git a/Makefile.am b/Makefile.am
index c1de02da0..a6e7ab232 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ EXTRA_DIST += \
 	HACKING \
 	NEWTAPS \
 	README.Windows \
-	README.OSX \
+	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
 	tools/logger.pl \
diff --git a/README.OSX b/README.macOS
similarity index 81%
rename from README.OSX
rename to README.macOS
index 979c64ba6..c532e67c6 100644
--- a/README.OSX
+++ b/README.macOS
@@ -1,10 +1,10 @@
-Building OpenOCD for OSX
-------------------------
+Building OpenOCD for macOS
+--------------------------
 
 There are a few prerequisites you will need first:
 
-- Xcode 5 (install from the AppStore)
-- Command Line Tools (install from Xcode 5 -> Preferences -> Downloads)
+- Xcode (install from the AppStore)
+- Command Line Tools (install from Xcode -> Preferences -> Downloads)
 - Gentoo Prefix (http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap.xml)
   or
 - Homebrew (http://mxcl.github.io/homebrew/)
@@ -12,6 +12,11 @@ There are a few prerequisites you will need first:
 - MacPorts (http://www.macports.org/install.php)
 
 
+If you're building manually you need Texinfo version 5.0 or later. The
+simplest way to get it is to use Homebrew (brew install texinfo) and
+then ``export PATH=/usr/local/opt/texinfo/bin:$PATH``.
+
+
 With Gentoo Prefix you can build the release version or the latest
 devel version (-9999) the usual way described in the Gentoo
 documentation. Alternatively, install the prerequisites and build