diff --git a/ChangeLog b/ChangeLog
index dc0bdd1..b666d2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/z3: new spell, The Z3 Theorem Prover
+ * devel/ocamlbuild: new spell, generic build tool
+ * devel/cil: new spell, C Intermediate Language
+
2019-08-17 Vlad Glagolev <stealth AT sourcemage.org>
* utils/perf: new spell, Linux performance analyzing tool
diff --git a/devel/cil/DEPENDS b/devel/cil/DEPENDS
new file mode 100755
index 0000000..5783418
--- /dev/null
+++ b/devel/cil/DEPENDS
@@ -0,0 +1,4 @@
+depends perl &&
+depends ocaml &&
+depends ocamlbuild &&
+depends findlib
diff --git a/devel/cil/DETAILS b/devel/cil/DETAILS
new file mode 100755
index 0000000..12f5168
--- /dev/null
+++ b/devel/cil/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=cil
+ VERSION=1.7.3+develop
+ REV_ID=936b04103eb573f320c6badf280e8bb17f6e7b26
+ SOURCE=cil-$REV_ID.tar.gz
+ SOURCE2=ce9f7edb28e031f48963dc8aa30c63dd8a8fb886.patch
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SOURCE%.tar.gz}"
+ WEB_SITE=https://github.com/cil-project/cil
+ SOURCE_URL=("$WEB_SITE/archive/$REV_ID.tar.gz")
+ SOURCE2_URL=("$WEB_SITE/commit/$SOURCE2")
+
SOURCE_HASH=sha512:c5d19666d11e0e0481a9080b965f16a6572c6f428b8432abc6a965e89cd9c8f88d4bff8dd9859358ca783fb9a8dd831440ac8c65ba41c37b5317fffb0f7a270d
+ SOURCE2_HASH=sha512:
+ LICENSE=(BSD-3-Clause)
+ SHORT="C Intermediate Language"
+cat << EOF
+CIL is a front-end for the C programming language that facilitates program
+analysis and transformation. CIL will parse and typecheck a program, and
+compile it into a simplified subset of C.
+
+CIL supports ANSI C as well as most of the extensions of the GNU C and
+Microsoft C compilers. A Perl script acts as a drop in replacement for either
+gcc or Microsoft's cl, and allows merging of the source files in your
project.
+Other features include support for control-flow and points-to analyses.
+EOF
diff --git a/devel/cil/HISTORY b/devel/cil/HISTORY
new file mode 100644
index 0000000..ac37f57
--- /dev/null
+++ b/devel/cil/HISTORY
@@ -0,0 +1,2 @@
+2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD: Spell created
diff --git a/devel/cil/PRE_BUILD b/devel/cil/PRE_BUILD
new file mode 100755
index 0000000..22c8c37
--- /dev/null
+++ b/devel/cil/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -fp1 -i "$SOURCE_CACHE/$SOURCE2" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/devel/ocamlbuild/BUILD b/devel/ocamlbuild/BUILD
new file mode 100755
index 0000000..1b2ae06
--- /dev/null
+++ b/devel/ocamlbuild/BUILD
@@ -0,0 +1 @@
+make configure all
diff --git a/devel/ocamlbuild/DEPENDS b/devel/ocamlbuild/DEPENDS
new file mode 100755
index 0000000..8da72f2
--- /dev/null
+++ b/devel/ocamlbuild/DEPENDS
@@ -0,0 +1 @@
+depends ocaml
diff --git a/devel/ocamlbuild/DETAILS b/devel/ocamlbuild/DETAILS
new file mode 100755
index 0000000..b40f6dd
--- /dev/null
+++ b/devel/ocamlbuild/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=ocamlbuild
+ VERSION=0.14.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=https://github.com/ocaml/ocamlbuild
+ SOURCE_URL=("$WEB_SITE/archive/$VERSION.tar.gz")
+
SOURCE_HASH=sha512:ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
+ LICENSE=(GPL-2.0-only)
+ SHORT="generic build tool"
+cat << EOF
+OCamlbuild is a generic build tool, that has built-in rules for building
OCaml
+library and programs.
+
+OCamlbuild's job is to determine the sequence of calls to the compiler, with
+the right set of command-line flags, needed to build your OCaml-centric
+software project.
+
+In recent years, the OCaml community has converged towards a more recent and
+faster build tool: Dune. If you are choosing a build system, you should
probably
+use Dune instead.
+EOF
diff --git a/devel/ocamlbuild/HISTORY b/devel/ocamlbuild/HISTORY
new file mode 100644
index 0000000..a56707f
--- /dev/null
+++ b/devel/ocamlbuild/HISTORY
@@ -0,0 +1,2 @@
+2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: Spell created
diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 35b90a3..3aa9e78 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -17,7 +17,7 @@ fi &&
--local-rust-root="$_rust_root" \
--enable-locked-deps \
--enable-vendor \
- --disable-extended \
+ --enable-extended \
--disable-docs \
--enable-llvm-link-shared \
$OPTS &&
diff --git a/devel/rust/CONFLICTS b/devel/rust/CONFLICTS
deleted file mode 100755
index edae60a..0000000
--- a/devel/rust/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts rust y
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index 767e3cb..3493b7a 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,5 +1,6 @@
SPELL=rust
VERSION=1.37.0
+ PATCHLEVEL=1
CARGO_VERSION=0.38.0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
TMPFS=off
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 811dcf4..3df4163 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,8 @@
+2019-08-20 Ismael Luceno <ismael AT iodev.co.uk>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: enable extended build (cargo and others)
+ * CONFLICTS: remove conflict with itself
+
2019-08-19 Ismael Luceno <ismael AT iodev.co.uk>
* BUILD, PRE_BUILD: Fixed build against musl
diff --git a/devel/z3/BUILD b/devel/z3/BUILD
new file mode 100755
index 0000000..6589170
--- /dev/null
+++ b/devel/z3/BUILD
@@ -0,0 +1,2 @@
+./configure &&
+make -C build
diff --git a/devel/z3/DEPENDS b/devel/z3/DEPENDS
new file mode 100755
index 0000000..8da72f2
--- /dev/null
+++ b/devel/z3/DEPENDS
@@ -0,0 +1 @@
+depends ocaml
diff --git a/devel/z3/DETAILS b/devel/z3/DETAILS
new file mode 100755
index 0000000..f1ad055
--- /dev/null
+++ b/devel/z3/DETAILS
@@ -0,0 +1,12 @@
+ SPELL=z3
+ VERSION=4.8.5
+ SOURCE=z3-Z3-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/z3-Z3-$VERSION"
+ WEB_SITE=https://github.com/Z3Prover/z3
+ SOURCE_URL=("$WEB_SITE/archive/Z3-$VERSION.tar.gz")
+
SOURCE_HASH=sha512:ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
+ LICENSE=(MIT)
+ SHORT="The Z3 Theorem Prover"
+cat << EOF
+Z3 is an SMT solver and supports the SMTLIB format.
+EOF
diff --git a/devel/z3/HISTORY b/devel/z3/HISTORY
new file mode 100644
index 0000000..093af70
--- /dev/null
+++ b/devel/z3/HISTORY
@@ -0,0 +1,2 @@
+2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: Spell created
diff --git a/devel/z3/INSTALL b/devel/z3/INSTALL
new file mode 100755
index 0000000..56912c9
--- /dev/null
+++ b/devel/z3/INSTALL
@@ -0,0 +1 @@
+make -C build install
diff --git a/libs/findlib/BUILD b/libs/findlib/BUILD
index 36f27b3..455d63f 100755
--- a/libs/findlib/BUILD
+++ b/libs/findlib/BUILD
@@ -4,4 +4,4 @@
-sitelib ${INSTALL_ROOT}/usr/lib/ocaml/site-lib \
$OPTS &&
make_single &&
-make all
+make all opt
diff --git a/libs/findlib/DETAILS b/libs/findlib/DETAILS
index 1051be7..3579939 100755
--- a/libs/findlib/DETAILS
+++ b/libs/findlib/DETAILS
@@ -1,8 +1,8 @@
SPELL=findlib
- VERSION=1.8.0
+ VERSION=1.8.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://www.ocaml-programming.de/packages/${SOURCE}
-
SOURCE_HASH=sha512:a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48
+
SOURCE_HASH=sha512:0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://projects.camlcity.org/projects/findlib.html
ENTERED=20060629
diff --git a/libs/findlib/HISTORY b/libs/findlib/HISTORY
index 11116d6..79b7969 100644
--- a/libs/findlib/HISTORY
+++ b/libs/findlib/HISTORY
@@ -1,3 +1,7 @@
+2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.1
+ * BUILD: build native libraries too
+
2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.8.0