diff --git a/.gitignore b/.gitignore
index dd8ec0d8..d37ed6db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ src/sdl2/generated/
 .project
 src/demo/main
 doc/
+target/
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..e1f74381
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+
+name    = "sdl2"
+version = "0.0.1"
+authors = [ "Tony Aldridge<zaragopha@hotmail.com>" ]
+build   = "make src/sdl2/generated/keycode.rs src/sdl2/generated/scancode.rs"
+
+[[lib]]
+
+name       = "sdl2"
+path       = "src/sdl2/lib.rs"
+crate-type = ["dylib"]
+
+[[bin]]
+
+name = "demo"
+path = "src/demo/main.rs"
+
+[dependencies.codegen]
+
+path = "src/codegen/"
+
diff --git a/Makefile b/Makefile
index bc7208f4..d89e0cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 RUSTC ?= rustc
 RUSTFLAGS ?=
 OUTDIR ?= ./build
+CARGODIR ?= ./target
 
 BINDIR = $(OUTDIR)/bin
 LIBDIR = $(OUTDIR)/lib
@@ -55,7 +56,12 @@ compile_demo: src/demo/main.rs src/demo/video.rs $(TMPDIR)/libsdl2.dummy $(BINDI
 demo: compile_demo
 	'$(BINDIR)/demo'
 
+.PHONY: cargo
+cargo:
+	cargo build
+
 .PHONY: clean
 clean:
 	rm -rf src/sdl2/generated
 	rm -rf '$(OUTDIR)'
+	rm -rf '$(CARGODIR)'
diff --git a/src/codegen/Cargo.toml b/src/codegen/Cargo.toml
new file mode 100644
index 00000000..778af8a1
--- /dev/null
+++ b/src/codegen/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+
+name    = "codegen"
+version = "0.0.1"
+authors = ["Graydon Hoare"]
+
+[[bin]]
+
+name = "codegen"
+path = "main.rs"
+