diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index ad8eb71..95ba62e 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -29,8 +29,12 @@ build() {
 }
 
 package() {
+  _cxx_libs_dir=$(python -c "import site; print(site.getsitepackages()[0])")/${pkgname}/cxx-libs/
   cd OpenTimelineIO-$pkgver
-  DESTDIR="$pkgdir" python setup.py install --root="$pkgdir" --optimize=1
+  DESTDIR="$pkgdir" python setup.py install --root="$pkgdir" --optimize=1 --cxx-install-root=$_cxx_libs_dir
+  install -d "$pkgdir/$_cxx_libs_dir"/include/opentimelineio/deps/{nonstd,any}
+  install -t "$pkgdir/$_cxx_libs_dir"/include/opentimelineio/deps/any src/deps/any/any.hpp
+  ln -s /usr/include/nonstd/optional.hpp "$pkgdir/$_cxx_libs_dir"/include/opentimelineio/deps/nonstd/optional.hpp
   mv "$pkgdir"/build/opentimelineio/src/*/*/*/opentimelineio/* "$pkgdir"/usr/lib/python*/site-packages/opentimelineio
   rm -fr "$pkgdir"/build
 }