diff --git a/src/.gitignore b/src/.gitignore
index a9d37c560c..d6168f7c42 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,2 +1,2 @@
 target
-Cargo.lock
+lib*/Cargo.lock
diff --git a/src/libcretonne/Cargo.toml b/src/libcretonne/Cargo.toml
index eccd757c7c..ba7edec6d9 100644
--- a/src/libcretonne/Cargo.toml
+++ b/src/libcretonne/Cargo.toml
@@ -2,6 +2,10 @@
 authors = ["The Cretonne Project Developers"]
 name = "cretonne"
 version = "0.0.0"
+description = "Low-level code generator library"
+documentation = "https://cretonne.readthedocs.org/"
+repository = "https://github.com/stoklund/cretonne"
+publish = false
 build = "build.rs"
 
 [lib]
diff --git a/src/libctonfile/Cargo.toml b/src/libctonfile/Cargo.toml
new file mode 100644
index 0000000000..7b2826b072
--- /dev/null
+++ b/src/libctonfile/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+authors = ["The Cretonne Project Developers"]
+name = "ctonfile"
+version = "0.0.0"
+publish = false
+
+[lib]
+name = "ctonfile"
+path = "lib.rs"
+
+[dependencies]
+cretonne = { path = "../libcretonne" }
diff --git a/src/libctonfile/lib.rs b/src/libctonfile/lib.rs
new file mode 100644
index 0000000000..3271ad035c
--- /dev/null
+++ b/src/libctonfile/lib.rs
@@ -0,0 +1,12 @@
+
+// ====------------------------------------------------------------------------------------==== //
+//
+// Cretonne file read/write library
+//
+// ====------------------------------------------------------------------------------------==== //
+//
+// The libctonfile library supports reading and writing .cton files. This functionality is needed
+// for testing Cretonne, but is not essential for a JIT compiler.
+
+extern crate cretonne;
+pub mod parser;
diff --git a/src/libctonfile/parser.rs b/src/libctonfile/parser.rs
new file mode 100644
index 0000000000..44cf3a2500
--- /dev/null
+++ b/src/libctonfile/parser.rs
@@ -0,0 +1,2 @@
+
+use cretonne;
diff --git a/src/tools/Cargo.lock b/src/tools/Cargo.lock
new file mode 100644
index 0000000000..90722ef5e7
--- /dev/null
+++ b/src/tools/Cargo.lock
@@ -0,0 +1,19 @@
+[root]
+name = "cretonne-tools"
+version = "0.0.0"
+dependencies = [
+ "cretonne 0.0.0",
+ "ctonfile 0.0.0",
+]
+
+[[package]]
+name = "cretonne"
+version = "0.0.0"
+
+[[package]]
+name = "ctonfile"
+version = "0.0.0"
+dependencies = [
+ "cretonne 0.0.0",
+]
+
diff --git a/src/tools/Cargo.toml b/src/tools/Cargo.toml
new file mode 100644
index 0000000000..b4477bd1e8
--- /dev/null
+++ b/src/tools/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+authors = ["The Cretonne Project Developers"]
+name = "cretonne-tools"
+version = "0.0.0"
+description = "Binaries for testing the Cretonne library"
+publish = false
+
+[[bin]]
+name = "cretonne"
+path = "main.rs"
+
+[dependencies]
+cretonne = { path = "../libcretonne" }
+ctonfile = { path = "../libctonfile" }
diff --git a/src/tools/main.rs b/src/tools/main.rs
new file mode 100644
index 0000000000..33cc1afe81
--- /dev/null
+++ b/src/tools/main.rs
@@ -0,0 +1,5 @@
+
+extern crate cretonne;
+extern crate ctonfile;
+
+fn main() {}