diff --git a/projects/spidermonkey/Dockerfile b/projects/spidermonkey/Dockerfile
index 78419f548..91c8332aa 100644
--- a/projects/spidermonkey/Dockerfile
+++ b/projects/spidermonkey/Dockerfile
@@ -15,8 +15,10 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
   autoconf2.13 \
+  libc++1 \
+  libc++abi1 \
   yasm \
   python
 
diff --git a/projects/spidermonkey/build.sh b/projects/spidermonkey/build.sh
index 55971eb5f..d5f34b80f 100755
--- a/projects/spidermonkey/build.sh
+++ b/projects/spidermonkey/build.sh
@@ -36,3 +36,8 @@ cd build_DBG.OBJ
 make "-j$(nproc)"
 
 cp dist/bin/js $OUT
+
+# Copy libraries.
+mkdir -p $OUT/lib
+cp -L /usr/lib/x86_64-linux-gnu/libc++.so.1 $OUT/lib
+cp -L /usr/lib/x86_64-linux-gnu/libc++abi.so.1 $OUT/lib
diff --git a/projects/spidermonkey/project.yaml b/projects/spidermonkey/project.yaml
index 00b57dec1..860415e62 100644
--- a/projects/spidermonkey/project.yaml
+++ b/projects/spidermonkey/project.yaml
@@ -3,6 +3,7 @@ language: c++
 primary_contact: "choller@mozilla.com"
 auto_ccs:
   - sledru@mozilla.com
+  - twsmith@mozilla.com
 fuzzing_engines:
   - none
 sanitizers: