diff --git a/docs/django.md b/docs/django.md
index e2bfbde17..1fc0f77e7 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -83,7 +83,7 @@ Then, run `fig up`:
     myapp_web_1 | Starting development server at http://0.0.0.0:8000/
     myapp_web_1 | Quit the server with CONTROL-C.
 
-And your Django app should be running at [localhost:8000](http://localhost:8000) (or [localdocker:8000](http://localdocker:8000) if you're using docker-osx).
+And your Django app should be running at port 8000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
 
 You can also run management commands with Docker. To set up your database, for example, run `fig up` and in another terminal run:
 
diff --git a/docs/index.md b/docs/index.md
index ef0a77f0c..c3e360a20 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -113,7 +113,7 @@ Now if we run `fig up`, it'll pull a Redis image, build an image for our own cod
     redis_1 | [8] 02 Jan 18:43:35.576 # Server started, Redis version 2.8.3
     web_1   |  * Running on http://0.0.0.0:5000/
 
-Open up [http://localhost:5000](http://localhost:5000) in your browser (or [http://localdocker:5000](http://localdocker:5000) if you're using [docker-osx](https://github.com/noplay/docker-osx)) and you should see it running!
+The web app should now be listening on port 5000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
 
 If you want to run your services in the background, you can pass the `-d` flag to `fig up` and use `fig ps` to see what is currently running:
 
diff --git a/docs/rails.md b/docs/rails.md
index 5ead07e58..25678b295 100644
--- a/docs/rails.md
+++ b/docs/rails.md
@@ -93,6 +93,6 @@ Finally, we just need to create the database. In another terminal, run:
 
     $ fig run web rake db:create
 
-And we're rolling—see for yourself at [localhost:3000](http://localhost:3000) (or [localdocker:3000](http://localdocker:3000) if you're using docker-osx).
+And we're rolling—your app should now be running on port 3000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
 
 ![Screenshot of Rails' stock index.html](https://orchardup.com/static/images/fig-rails-screenshot.png)
diff --git a/docs/wordpress.md b/docs/wordpress.md
index 47e8e443a..3f8db9da0 100644
--- a/docs/wordpress.md
+++ b/docs/wordpress.md
@@ -88,4 +88,4 @@ if(file_exists($root.$path))
 }else include_once 'index.php';
 ```
 
-With those four files in place, run `fig up` inside your Wordpress directory and it'll pull and build the images we need, and then start the web and database containers. You'll then be able to visit Wordpress and set it up by visiting [localhost:8000](http://localhost:8000) - or [localdocker:8000](http://localdocker:8000) if you're using docker-osx.
+With those four files in place, run `fig up` inside your Wordpress directory and it'll pull and build the images we need, and then start the web and database containers. You'll then be able to visit Wordpress at port 8000 on your docker daemon (if you're using boot2docker, `boot2docker ip` will tell you its address).
diff --git a/docs/yml.md b/docs/yml.md
index 742fdaf18..dedfa5c1d 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -87,10 +87,6 @@ expose:
 Mount paths as volumes, optionally specifying a path on the host machine
 (`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
 
-Note for fig on OSX: Mapping local volumes is currently unsupported on
-boot2docker. We recommend you use [docker-osx](https://github.com/noplay/docker-osx)
-if want to map local volumes on OSX.
-
 ```
 volumes:
  - /var/lib/mysql
diff --git a/fig/cli/command.py b/fig/cli/command.py
index dd98efef5..c65d72712 100644
--- a/fig/cli/command.py
+++ b/fig/cli/command.py
@@ -34,8 +34,8 @@ class Command(DocoptCommand):
                     raise errors.DockerNotFoundUbuntu()
                 else:
                     raise errors.DockerNotFoundGeneric()
-            elif call_silently(['which', 'docker-osx']) == 0:
-                raise errors.ConnectionErrorDockerOSX()
+            elif call_silently(['which', 'boot2docker']) == 0:
+                raise errors.ConnectionErrorBoot2Docker()
             else:
                 raise errors.ConnectionErrorGeneric(self.get_client().base_url)
 
diff --git a/fig/cli/errors.py b/fig/cli/errors.py
index c61ab8a5f..53d1af36e 100644
--- a/fig/cli/errors.py
+++ b/fig/cli/errors.py
@@ -39,10 +39,10 @@ class DockerNotFoundGeneric(UserError):
         """)
 
 
-class ConnectionErrorDockerOSX(UserError):
+class ConnectionErrorBoot2Docker(UserError):
     def __init__(self):
-        super(ConnectionErrorDockerOSX, self).__init__("""
-        Couldn't connect to Docker daemon - you might need to run `docker-osx shell`.
+        super(ConnectionErrorBoot2Docker, self).__init__("""
+        Couldn't connect to Docker daemon - you might need to run `boot2docker up`.
         """)