diff --git a/docs/contributors/getting-started.md b/docs/contributors/getting-started.md
index 7cf1ecbd6e55ae..65c5269f7264fc 100644
--- a/docs/contributors/getting-started.md
+++ b/docs/contributors/getting-started.md
@@ -87,7 +87,7 @@ You'll need to run this again if new plugins are added. To run e2e tests:
 WP_BASE_URL=http://localhost:8888/gutenberg npm run test-e2e
 ```
 
-### Caching of PHP files
+#### Caching of PHP files
 
 You'll need to disable OPCache in order to correctly work on PHP files. To fix:
 
@@ -95,7 +95,7 @@ You'll need to disable OPCache in order to correctly work on PHP files. To fix:
 - Under **Cache**, select **off**
 - Confirm with **OK**
 
-### Incoming connections
+#### Incoming connections
 
 By default, the web server (Apache) launched by MAMP will listen to all incoming connections, not just local ones. This means that anyone on the same local network (and, in certain cases, anyone on the Internet) can access your web server. This may be intentional and useful for testing sites on other devices, but most often this can be a privacy or security issue. Keep this in mind and don't store sensitive information in this server.
 
@@ -104,7 +104,7 @@ While it is possible to fix this, you should fix it at your own risk, since it b
 - Edit `/Applications/MAMP/conf/apache/httpd.conf`
 - Change `Listen 8888` to `Listen 127.0.0.1:8888`
 
-### Linking to other directories
+#### Linking to other directories
 
 You may like to create links in your `plugins` and `themes` directories to other folders, e.g.
 
@@ -116,6 +116,10 @@ If so, you need to instruct Apache to allow following such links:
 - Open or start a new file at `/Applications/MAMP/htdocs/.htaccess`
 - Add the following line: `Options +SymLinksIfOwnerMatch`
 
+#### Using WP-CLI
+
+Tools like MAMP tend to configure MySQL to use ports other than the default 3306, often preferring 8889. This may throw off WP-CLI, which will fail after trying to connect to the database. To remedy this, edit `wp-config.php` and change the `DB_HOST` constant from `define( 'DB_HOST', 'localhost' )` to `define( 'DB_HOST', '127.0.0.1:8889' )`.
+
 ## On A Remote Server
 =======
 ### On A Remote Server