diff --git a/MANIFEST.in b/MANIFEST.in
index 294e3fece..c61464502 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,5 @@
-include LICENSE include/*.h core/*.cpp core/*.h python/*.c third_party/json/*.hpp third_party/md5/*.cpp third_party/md5/*.h stdlib/std.jsonnet Makefile
+include LICENSE include/*.h core/*.cpp core/*.h python/*.c stdlib/std.jsonnet Makefile
+include third_party/json/*.hpp
+include third_party/md5/*.cpp third_party/md5/*.h
+recursive-include third_party/rapidyaml/rapidyaml *.hpp *.cpp *.h
 #recursive-include test_suite examples gc_stress benchmarks editors
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 554990284..eb7686c23 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@ add_dependencies(libjsonnet++ jsonnet)
 # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
 # this step the output would be |liblibjsonnet|.
 set_target_properties(libjsonnet++ PROPERTIES OUTPUT_NAME jsonnet++
-	VERSION     "0.17.0"
+	VERSION     "0.18.0"
 	SOVERSION   "0"
 	PUBLIC_HEADER "${LIB_HEADER}")
 install(TARGETS libjsonnet++
diff --git a/doc/ref/stdlib.html b/doc/ref/stdlib.html
index c9ceec64e..d7c1b97b8 100644
--- a/doc/ref/stdlib.html
+++ b/doc/ref/stdlib.html
@@ -172,7 +172,7 @@ <h4 id="get">
     <div class="panel">
       <p>
         <em>
-          Available in upcoming release.
+          Available since version 0.18.0.
         </em>
       </p>
       <p>
@@ -1452,7 +1452,7 @@ <h4 id="manifestJsonMinified">
     <div class="panel">
       <p>
         <em>
-          Available in upcoming release.
+          Available since version 0.18.0.
         </em>
       </p>
       <p>
@@ -1655,7 +1655,7 @@ <h4 id="manifestTomlEx">
     <div class="panel">
       <p>
         <em>
-          Available in upcoming release.
+          Available since version 0.18.0.
         </em>
       </p>
       <p>
diff --git a/include/libjsonnet.h b/include/libjsonnet.h
index fababa774..94746b67b 100644
--- a/include/libjsonnet.h
+++ b/include/libjsonnet.h
@@ -31,7 +31,7 @@ limitations under the License.
  *
  * If this isn't the sae as jsonnet_version() then you've got a mismatched binary / header.
  */
-#define LIB_JSONNET_VERSION "v0.17.0"
+#define LIB_JSONNET_VERSION "v0.18.0"
 
 /** Return the version string of the Jsonnet interpreter.  Conforms to semantic versioning
  * https://semver.org/ If this does not match LIB_JSONNET_VERSION then there is a mismatch between
diff --git a/setup.py b/setup.py
index e1bfb484e..0a2748a65 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,8 @@
 from subprocess import Popen
 
 DIR = os.path.abspath(os.path.dirname(__file__))
+# NOTE: If you are editing the array below then you probably also need
+# to change MANIFEST.in.
 LIB_OBJECTS = [
     'core/desugarer.o',
     'core/formatter.o',
@@ -70,7 +72,7 @@ def run(self):
     '_jsonnet',
     sources=MODULE_SOURCES,
     extra_objects=LIB_OBJECTS,
-    include_dirs = ['include', 'third_party/md5', 'third_party/json'],
+    include_dirs = ['include'],
     language='c++'
 )
 
diff --git a/test_cmd/fmt_help.golden.stdout b/test_cmd/fmt_help.golden.stdout
index b8809aa6f..fc5149941 100644
--- a/test_cmd/fmt_help.golden.stdout
+++ b/test_cmd/fmt_help.golden.stdout
@@ -1,4 +1,4 @@
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
 
 jsonnetfmt {<option>} { <filename> }
 
diff --git a/test_cmd/fmt_help.golden.stdout.golang b/test_cmd/fmt_help.golden.stdout.golang
index bbe6d022c..c29f44be0 100644
--- a/test_cmd/fmt_help.golden.stdout.golang
+++ b/test_cmd/fmt_help.golden.stdout.golang
@@ -1,4 +1,4 @@
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
 
 jsonnetfmt {<option>} { <filename> }
 
diff --git a/test_cmd/fmt_no_args.golden.stderr b/test_cmd/fmt_no_args.golden.stderr
index 3bc0d6084..3ccfbce84 100644
--- a/test_cmd/fmt_no_args.golden.stderr
+++ b/test_cmd/fmt_no_args.golden.stderr
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
 
 jsonnetfmt {<option>} { <filename> }
 
diff --git a/test_cmd/fmt_no_args.golden.stderr.golang b/test_cmd/fmt_no_args.golden.stderr.golang
index 528139089..114b82b5e 100644
--- a/test_cmd/fmt_no_args.golden.stderr.golang
+++ b/test_cmd/fmt_no_args.golden.stderr.golang
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
 
 jsonnetfmt {<option>} { <filename> }
 
diff --git a/test_cmd/fmt_version1.golden.stdout b/test_cmd/fmt_version1.golden.stdout
index e6969277d..c9ef4189a 100644
--- a/test_cmd/fmt_version1.golden.stdout
+++ b/test_cmd/fmt_version1.golden.stdout
@@ -1 +1 @@
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
diff --git a/test_cmd/fmt_version2.golden.stdout b/test_cmd/fmt_version2.golden.stdout
index e6969277d..c9ef4189a 100644
--- a/test_cmd/fmt_version2.golden.stdout
+++ b/test_cmd/fmt_version2.golden.stdout
@@ -1 +1 @@
-Jsonnet reformatter v0.17.0
+Jsonnet reformatter v0.18.0
diff --git a/test_cmd/help.golden.stdout.cpp b/test_cmd/help.golden.stdout.cpp
index b4c17541f..28c3d0331 100644
--- a/test_cmd/help.golden.stdout.cpp
+++ b/test_cmd/help.golden.stdout.cpp
@@ -1,4 +1,4 @@
-Jsonnet commandline interpreter v0.17.0
+Jsonnet commandline interpreter v0.18.0
 
 jsonnet {<option>} <filename>
 
diff --git a/test_cmd/help.golden.stdout.golang b/test_cmd/help.golden.stdout.golang
index 8432a0d45..909f32565 100644
--- a/test_cmd/help.golden.stdout.golang
+++ b/test_cmd/help.golden.stdout.golang
@@ -1,4 +1,4 @@
-Jsonnet commandline interpreter (Go implementation) v0.17.0
+Jsonnet commandline interpreter (Go implementation) v0.18.0
 
 jsonnet {<option>} <filename>
 
diff --git a/test_cmd/no_args.golden.stderr.cpp b/test_cmd/no_args.golden.stderr.cpp
index 7ae7776a5..86402b28d 100644
--- a/test_cmd/no_args.golden.stderr.cpp
+++ b/test_cmd/no_args.golden.stderr.cpp
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet commandline interpreter v0.17.0
+Jsonnet commandline interpreter v0.18.0
 
 jsonnet {<option>} <filename>
 
diff --git a/test_cmd/no_args.golden.stderr.golang b/test_cmd/no_args.golden.stderr.golang
index 193017f40..134645d14 100644
--- a/test_cmd/no_args.golden.stderr.golang
+++ b/test_cmd/no_args.golden.stderr.golang
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet commandline interpreter (Go implementation) v0.17.0
+Jsonnet commandline interpreter (Go implementation) v0.18.0
 
 jsonnet {<option>} <filename>
 
diff --git a/test_cmd/version1.golden.stdout.cpp b/test_cmd/version1.golden.stdout.cpp
index d75615672..a1962a09a 100644
--- a/test_cmd/version1.golden.stdout.cpp
+++ b/test_cmd/version1.golden.stdout.cpp
@@ -1 +1 @@
-Jsonnet commandline interpreter v0.17.0
+Jsonnet commandline interpreter v0.18.0
diff --git a/test_cmd/version1.golden.stdout.golang b/test_cmd/version1.golden.stdout.golang
index b7694158a..fe9d047f8 100644
--- a/test_cmd/version1.golden.stdout.golang
+++ b/test_cmd/version1.golden.stdout.golang
@@ -1 +1 @@
-Jsonnet commandline interpreter (Go implementation) v0.17.0
+Jsonnet commandline interpreter (Go implementation) v0.18.0
diff --git a/test_cmd/version2.golden.stdout.cpp b/test_cmd/version2.golden.stdout.cpp
index d75615672..a1962a09a 100644
--- a/test_cmd/version2.golden.stdout.cpp
+++ b/test_cmd/version2.golden.stdout.cpp
@@ -1 +1 @@
-Jsonnet commandline interpreter v0.17.0
+Jsonnet commandline interpreter v0.18.0
diff --git a/test_cmd/version2.golden.stdout.golang b/test_cmd/version2.golden.stdout.golang
index b7694158a..fe9d047f8 100644
--- a/test_cmd/version2.golden.stdout.golang
+++ b/test_cmd/version2.golden.stdout.golang
@@ -1 +1 @@
-Jsonnet commandline interpreter (Go implementation) v0.17.0
+Jsonnet commandline interpreter (Go implementation) v0.18.0