diff --git a/.travis.yml b/.travis.yml
index dc3a28981..086b7f252 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,9 +41,10 @@ matrix:
       os: osx
 
     # BSD
-    - env: TARGET=i686-unknown-freebsd            CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17
+    # FIXME: freebsd fails to link when CPP=1
+    - env: TARGET=i686-unknown-freebsd                  DYLIB=1 STD=1 OPENSSL=0.7.17
     - env: TARGET=x86_64-unknown-dragonfly        CPP=1 DYLIB=1       OPENSSL=0.5.5
-    - env: TARGET=x86_64-unknown-freebsd          CPP=1 DYLIB=1 STD=1 OPENSSL=0.5.5
+    - env: TARGET=x86_64-unknown-freebsd                DYLIB=1 STD=1 OPENSSL=0.5.5
     - env: TARGET=x86_64-unknown-netbsd           CPP=1 DYLIB=1 STD=1 OPENSSL=0.7.17
 
     # Solaris
diff --git a/README.md b/README.md
index 66ea7bc5b..c9b3fec48 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ worst, "hang" (never terminate).
 | `i586-unknown-linux-gnu`             | 2.23   | 5.3.1   | 1.0.2m  | ✓   | N/A   |   ✓    |
 | `i686-linux-android` [5]             | N/A    | 4.9     | 1.0.2m  | ✓   | N/A   |   ✓    |
 | `i686-pc-windows-gnu`                | N/A    | 7.3.0   | N/A     | ✓   | N/A   |   ✓    |
-| `i686-unknown-freebsd` [1]           | 10.2   | 5.3.0   | 1.0.2m  | ✓   | N/A   |        |
+| `i686-unknown-freebsd` [1]           | 10.2   | 5.3.0   | 1.0.2m  |     | N/A   |        |
 | `i686-unknown-linux-gnu`             | 2.15   | 4.6.2   | 1.0.2m  | ✓   | N/A   |   ✓    |
 | `i686-unknown-linux-musl`            | 1.1.15 | 5.3.1   | 1.0.2m  |     | N/A   |   ✓    |
 | `mips-unknown-linux-gnu`             | 2.23   | 5.3.1   | 1.0.2m  | ✓   | 2.8.0 |   ✓    |
@@ -223,7 +223,7 @@ worst, "hang" (never terminate).
 | `x86_64-pc-windows-gnu`              | N/A    | 7.3.0   | N/A     | ✓   | N/A   |   ✓    |
 | `x86_64-sun-solaris` [1]             | 2.11   | 5.3.0   | 1.0.2m  | ✓   | N/A   |        |
 | `x86_64-unknown-dragonfly` [1] [2]   | 4.6.0  | 5.3.0   | 1.0.2m  | ✓   | N/A   |        |
-| `x86_64-unknown-freebsd` [1]         | 10.2   | 5.3.0   | 1.0.2m  | ✓   | N/A   |        |
+| `x86_64-unknown-freebsd` [1]         | 10.2   | 5.3.0   | 1.0.2m  |     | N/A   |        |
 | `x86_64-unknown-linux-gnu`           | 2.15   | 4.6.2   | 1.0.2m  | ✓   | N/A   |   ✓    |
 | `x86_64-unknown-linux-musl`          | 1.1.15 | 5.3.1   | 1.0.2m  |     | N/A   |   ✓    |
 | `x86_64-unknown-netbsd`[1]           | 7.0    | 5.3.0   | 1.0.2m  | ✓   | N/A   |        |
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
index 3fca7ede8..4d99d2a98 100644
--- a/docker/freebsd.sh
+++ b/docker/freebsd.sh
@@ -69,11 +69,14 @@ main() {
     cp $td/freebsd/lib/libm.so.5 $destdir/lib
     cp $td/freebsd/lib/libthr.so.3 $destdir/lib/libpthread.so
     cp $td/freebsd/lib/libutil.so.9 $destdir/lib
+    cp $td/freebsd/usr/lib/libc++.so.1 $destdir/lib
+    cp $td/freebsd/usr/lib/libc++.a $destdir/lib
     cp $td/freebsd/usr/lib/lib{c,util,m}.a $destdir/lib
     cp $td/freebsd/usr/lib/lib{rt,execinfo}.so.1 $destdir/lib
     cp $td/freebsd/usr/lib/{crt1,Scrt1,crti,crtn}.o $destdir/lib
 
     ln -s libc.so.7 $destdir/lib/libc.so
+    ln -s libc++.so.1 $destdir/lib/libc++.so
     ln -s libexecinfo.so.1 $destdir/lib/libexecinfo.so
     ln -s libm.so.5 $destdir/lib/libm.so
     ln -s librt.so.1 $destdir/lib/librt.so