diff --git a/.travis-ci.sh b/.travis-ci.sh
index f7d95102..07e7f86f 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -21,8 +21,11 @@ opam update -u
 TARGETS="mirage-http mirage mirage-xen github dns tls mirage-profile"
 opam install ${TARGETS}
 eval `opam config env`
-git clone git://github.com/mirage/mirage-skeleton
+git clone git://github.com/talex5/mirage-skeleton -b tls
 cd mirage-skeleton
 make configure
 make depend
 make build
+make clean
+make configure MODE=xen
+make build MODE=xen
diff --git a/packages/conduit/conduit.dev/descr b/packages/conduit/conduit.dev/descr
new file mode 100644
index 00000000..fe8b5fe8
--- /dev/null
+++ b/packages/conduit/conduit.dev/descr
@@ -0,0 +1,15 @@
+Network connection library for TCP and SSL
+
+The `conduit` library takes care of establishing and listening for TCP and
+SSL/TLS connections for the Lwt and Async libraries.
+
+The reason this library exists is to provide a degree of abstraction
+from the precise SSL library used, since there are a variety of ways to bind to
+a library (e.g. the C FFI, or the Ctypes library), as well as well as which
+library is used (either OpenSSL or a native OCaml TLS implementation).
+
+If you are using the `Lwt_unix` version of the library, you can set two
+environment variables to control the behaviour of the library:
+
+- `CONDUIT_DEBUG=1` will output debug information to standard error.
+- `CONDUIT_TLS=native` will force the use of the pure OCaml TLS library.
diff --git a/packages/conduit/conduit.dev/opam b/packages/conduit/conduit.dev/opam
new file mode 100644
index 00000000..827f9587
--- /dev/null
+++ b/packages/conduit/conduit.dev/opam
@@ -0,0 +1,37 @@
+opam-version: "1.1"
+maintainer: "anil@recoil.org"
+tags: [
+  "org:mirage"
+]
+build: [
+  [make]
+  [make "install"]
+]
+remove: ["ocamlfind" "remove" "conduit"]
+depends: [
+  "ocamlfind"
+  "sexplib" {>="109.15.00"}
+  "stringext"
+  "uri"
+  "cstruct" {>="1.0.1"}
+  "ipaddr" {>="2.5.0"}
+]
+depopts: [
+  "async"
+  "lwt"
+  "ssl"
+  "async_ssl"
+  "mirage-dns"
+  "vchan"
+  "tls"
+]
+conflicts: [
+  "async" {<"109.15.00"}
+  "lwt" {<"2.4.3"}
+  "async_ssl" {<"111.21.00"}
+  "mirage-types" {<"2.0.0"}
+  "dns" {<"0.10.0"}
+  "tls" {<"0.2.0"}
+  "vchan" {<"2.0.0"}
+]
+available: [ocaml-version >= "4.01.0"]
diff --git a/packages/conduit/conduit.dev/url b/packages/conduit/conduit.dev/url
new file mode 100644
index 00000000..37b80072
--- /dev/null
+++ b/packages/conduit/conduit.dev/url
@@ -0,0 +1 @@
+archive: "https://github.com/talex5/ocaml-conduit.git#tls"
diff --git a/packages/ctypes/ctypes.0.4.0/descr b/packages/ctypes/ctypes.0.4.0/descr
deleted file mode 100644
index 584db29f..00000000
--- a/packages/ctypes/ctypes.0.4.0/descr
+++ /dev/null
@@ -1 +0,0 @@
-Combinators for binding to C libraries without writing any C.
diff --git a/packages/ctypes/ctypes.0.4.0/opam b/packages/ctypes/ctypes.0.4.0/opam
deleted file mode 100644
index 978d9543..00000000
--- a/packages/ctypes/ctypes.0.4.0/opam
+++ /dev/null
@@ -1,35 +0,0 @@
-opam-version: "1.2"
-maintainer: "yallop@gmail.com"
-author: "yallop@gmail.com"
-homepage: "https://github.com/ocamllabs/ocaml-ctypes"
-bug-reports: "https://github.com/ocamllabs/ocaml-ctypes/issues"
-dev-repo: "git://github.com/ocamllabs/ocaml-ctypes"
-license: "MIT"
-tags: [
-  "org:ocamllabs"
-  "org:mirage"
-]
-build: [
-  [make "XEN=%{mirage-xen:enable}%"]
-]
-install: [
-  [make "install"  "XEN=%{mirage-xen:enable}%"]
-]
-remove: ["ocamlfind" "remove" "ctypes"]
-depends: [
-  "base-bytes"
-  "ocamlfind"
-]
-depopts: [
-  "mirage-xen"
-]
-depexts: [
-  [["centos"] ["libffi-devel"]]
-  [["debian"] ["libffi-dev"]]
-  [["homebrew" "osx"] ["libffi"]]
-  [["ubuntu"] ["libffi-dev"]]
-]
-post-messages: [
-  "This package requires libffi on your system" {failure}
-]
-available: [ ocaml-version >= "4.00.0"]
diff --git a/packages/ctypes/ctypes.0.4.0/url b/packages/ctypes/ctypes.0.4.0/url
deleted file mode 100644
index 1a1ebbb9..00000000
--- a/packages/ctypes/ctypes.0.4.0/url
+++ /dev/null
@@ -1 +0,0 @@
-git: "git://github.com/ocamllabs/ocaml-ctypes"
diff --git a/packages/gmp/gmp.6.0.0/opam b/packages/gmp/gmp.6.0.0/opam
index aff53ced..6d8c1a7f 100644
--- a/packages/gmp/gmp.6.0.0/opam
+++ b/packages/gmp/gmp.6.0.0/opam
@@ -13,6 +13,9 @@ remove: [
       "%{prefix}%/lib/pkgconfig/gmp.pc"
       "%{prefix}%/lib/gmp" ]
  ]
+depends: [
+  "ocamlfind"
+]
 depopts: [
   "mirage-xen"
 ]
diff --git a/packages/mirage-profile/mirage-profile.0.1/descr b/packages/mirage-profile/mirage-profile.0.1/descr
deleted file mode 100644
index cf5a786a..00000000
--- a/packages/mirage-profile/mirage-profile.0.1/descr
+++ /dev/null
@@ -1 +0,0 @@
-Collect profiling information
diff --git a/packages/mirage-profile/mirage-profile.0.1/opam b/packages/mirage-profile/mirage-profile.0.1/opam
deleted file mode 100644
index 08506669..00000000
--- a/packages/mirage-profile/mirage-profile.0.1/opam
+++ /dev/null
@@ -1,27 +0,0 @@
-opam-version: "1.2"
-name: "mirage-profile"
-version: "0.1"
-maintainer: "Thomas Leonard <talex5@gmail.com>"
-authors: "Thomas Leonard <talex5@gmail.com>"
-homepage: "https://github.com/mirage/mirage-profile"
-bug-reports: "https://github.com/mirage/mirage-profile"
-license: "BSD-2-clause"
-build: [
-	["./configure"
-	  "--prefix" prefix
-	  "--%{mirage-xen-minios:enable}%-xen"
-	]
-	[make]
-]
-install: [make "install"]
-remove: ["ocamlfind" "remove" "mirage-profile"]
-depends: [
-  "ocamlfind" {build}
-  "cstruct"
-  "ocplib-endian"
-  "io-page"
-  "lwt"
-]
-depopts: [
-	"mirage-xen-minios"
-]
diff --git a/packages/mirage-profile/mirage-profile.0.1/url b/packages/mirage-profile/mirage-profile.0.1/url
deleted file mode 100644
index 5a4d36dc..00000000
--- a/packages/mirage-profile/mirage-profile.0.1/url
+++ /dev/null
@@ -1 +0,0 @@
-git: "git://github.com/mirage/mirage-profile"
diff --git a/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/descr b/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/descr
deleted file mode 100644
index 9cd7a391..00000000
--- a/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Lwt module type definitions for Mirage-compatible applications
-
-This is a virtual package that pulls in all the concrete
-dependencies required for the `mirage-types.lwt` ocamlfind
-package to become available.
-
-The purpose of this library is to provide concrete types
-for several that are left abstract in `mirage-types`:
-
-- `type 'a io = 'a Lwt.t`
-- `type page_aligned_buffer = Io_page.t`
-- `type buffer = Cstruct.t`
-- `type macaddr = Macaddr.t`
-- `type ipv4addr = Ipaddr.V4.t`
diff --git a/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/opam b/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/opam
deleted file mode 100644
index 1a899a14..00000000
--- a/packages/mirage-types-lwt/mirage-types-lwt.2.0.0/opam
+++ /dev/null
@@ -1,16 +0,0 @@
-opam-version: "1"
-maintainer: "anil@recoil.org"
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-depends: [
-  "ocamlfind"
-  "sexplib"
-  "lwt"
-  "cstruct" {>="1.4.0"}
-  "io-page"
-  "ipaddr"
-  "mirage-types" {>="2.0.0"}
-]
-ocaml-version: [>="4.00.0"]
diff --git a/packages/mirage-www/mirage-www.1.2.0/descr b/packages/mirage-www/mirage-www.1.2.0/descr
deleted file mode 100644
index ad5c79b8..00000000
--- a/packages/mirage-www/mirage-www.1.2.0/descr
+++ /dev/null
@@ -1 +0,0 @@
-Mirage website (written in Mirage)
diff --git a/packages/mirage-www/mirage-www.1.2.0/files/mirage-www.install b/packages/mirage-www/mirage-www.1.2.0/files/mirage-www.install
deleted file mode 100644
index 7859246c..00000000
--- a/packages/mirage-www/mirage-www.1.2.0/files/mirage-www.install
+++ /dev/null
@@ -1,3 +0,0 @@
-bin: [
-  "src/mir-www" {"mirage-www"}
-]
diff --git a/packages/mirage-www/mirage-www.1.2.0/opam b/packages/mirage-www/mirage-www.1.2.0/opam
deleted file mode 100644
index 9289d35e..00000000
--- a/packages/mirage-www/mirage-www.1.2.0/opam
+++ /dev/null
@@ -1,24 +0,0 @@
-opam-version: "1"
-maintainer: "anil@recoil.org"
-build: [
-  [make "configure"]
-  [make "MODE=unix"]
-]
-depends: [
-  "mirage" {>= "1.2.0"}
-  "crunch" {>= "1.2.3"}
-  "fat-filesystem" {>= "0.9.0"}
-  "cow" {>= "0.9.0" }
-  "ssl"
-  "ipaddr"
-  "lwt" {>="2.4.3"}
-  "cstruct" {>="1.0.1"}
-  "cowabloga" {>= "0.0.7"}
-  "tcpip"
-  "mirage-http" {>= "1.1.0"}
-  "mirage-block-unix" {>= "1.2.0"}
-  "mirage-fs-unix" {>= "1.0.0"}
-  "mirage-console"
-  "cohttp" {>="0.12.0"}
-]
-ocaml-version: [>= "4.00.0"]
diff --git a/packages/mirage-www/mirage-www.1.2.0/url b/packages/mirage-www/mirage-www.1.2.0/url
deleted file mode 100644
index 024e6d9f..00000000
--- a/packages/mirage-www/mirage-www.1.2.0/url
+++ /dev/null
@@ -1 +0,0 @@
-git: "git://github.com/mirage/mirage-www"
diff --git a/packages/mirage/mirage.dev/descr b/packages/mirage/mirage.dev/descr
new file mode 100644
index 00000000..02ca9f7e
--- /dev/null
+++ b/packages/mirage/mirage.dev/descr
@@ -0,0 +1,10 @@
+The Mirage library operating system
+
+Mirage is a unikernel for constructing secure, high-performance
+network applications across a variety of cloud computing and mobile
+platforms. Code can be developed on a normal OS such as Linux or MacOS
+X, and then compiled into a fully-standalone, specialised microkernel
+that runs under the Xen hypervisor. Since Xen powers most public cloud
+computing infrastructure such as Amazon EC2, this lets your servers
+run more cheaply, securely and finer control than with a full software
+stack.
diff --git a/packages/mirage/mirage.dev/opam b/packages/mirage/mirage.dev/opam
new file mode 100644
index 00000000..1ac9fdeb
--- /dev/null
+++ b/packages/mirage/mirage.dev/opam
@@ -0,0 +1,36 @@
+opam-version: "1.1"
+maintainer: [
+  "anil@recoil.org"
+  "thomas@gazagnaire.org"
+]
+authors: [
+  "Anil Madhavapeddy"
+  "Thomas Gazagnaire"
+  "Dave Scott"
+  "Richard Mortier"
+]
+tags: [
+  "org:mirage"
+  "org:xapi-project"
+]
+build: [
+  ["./configure" "--bindir" "%{bin}%"]
+  [make]
+  [make "install"]
+]
+remove: [
+  ["rm" "-f" "%{bin}%/mirage"]
+  ["ocamlfind" "remove" "mirage"]
+]
+depends: [
+  "ipaddr" {>= "1.0.0"}
+  "mirage-types" {>= "2.2.0"}
+  "re" {>= "1.2.1"}
+  "cmdliner" {>= "0.9.2"}
+  "lwt" {>= "2.4.3"}
+  "cstruct" {>= "1.0.1"}
+  "io-page" {>= "1.0.0"}
+  "crunch"
+  "sexplib"
+]
+ocaml-version: [>="4.01.0"]
diff --git a/packages/mirage/mirage.dev/url b/packages/mirage/mirage.dev/url
new file mode 100644
index 00000000..378bd0f7
--- /dev/null
+++ b/packages/mirage/mirage.dev/url
@@ -0,0 +1 @@
+archive: "https://github.com/talex5/mirage.git#conduit-tls"
diff --git a/packages/shared-memory-ring/shared-memory-ring.1.1.1/descr b/packages/shared-memory-ring/shared-memory-ring.1.1.1/descr
deleted file mode 100644
index d6a9c642..00000000
--- a/packages/shared-memory-ring/shared-memory-ring.1.1.1/descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Shared memory rings for RPC and bytestream communications.
-Includes concrete implementations of Xen console and Xenstore 
-rings.
diff --git a/packages/shared-memory-ring/shared-memory-ring.1.1.1/findlib b/packages/shared-memory-ring/shared-memory-ring.1.1.1/findlib
deleted file mode 100644
index 8144a99a..00000000
--- a/packages/shared-memory-ring/shared-memory-ring.1.1.1/findlib
+++ /dev/null
@@ -1 +0,0 @@
-shared-memory-ring
diff --git a/packages/shared-memory-ring/shared-memory-ring.1.1.1/opam b/packages/shared-memory-ring/shared-memory-ring.1.1.1/opam
deleted file mode 100644
index 049fee2d..00000000
--- a/packages/shared-memory-ring/shared-memory-ring.1.1.1/opam
+++ /dev/null
@@ -1,18 +0,0 @@
-opam-version: "1"
-maintainer: "dave.scott@eu.citrix.com"
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [
-  [make "all"]
-  [make "install"]
-]
-remove: [["ocamlfind" "remove" "shared-memory-ring"]]
-depends: [
-  "cstruct" {>= "0.7.1"}
-  "lwt"
-  "ocamlfind"
-  "ounit"
-  "mirage-profile"
-]
diff --git a/packages/shared-memory-ring/shared-memory-ring.1.1.1/url b/packages/shared-memory-ring/shared-memory-ring.1.1.1/url
deleted file mode 100644
index a7a033bf..00000000
--- a/packages/shared-memory-ring/shared-memory-ring.1.1.1/url
+++ /dev/null
@@ -1,2 +0,0 @@
-archive: "https://github.com/mirage/shared-memory-ring/archive/1.1.1.tar.gz"
-checksum: "9b79288c82267bd5d64fbe889510c1eb"
diff --git a/packages/tls/tls.0.3.0/descr b/packages/tls/tls.0.3.0/descr
new file mode 100644
index 00000000..a7c90c32
--- /dev/null
+++ b/packages/tls/tls.0.3.0/descr
@@ -0,0 +1,4 @@
+Transport Layer Security (TLS) in OCaml
+
+A clean-slate TLS implementation, with support for protocol versions 1.0-1.2.
+Includes the core library, as well as Lwt and Mirage frontends.
diff --git a/packages/tls/tls.0.3.0/findlib b/packages/tls/tls.0.3.0/findlib
new file mode 100644
index 00000000..c7c22778
--- /dev/null
+++ b/packages/tls/tls.0.3.0/findlib
@@ -0,0 +1 @@
+tls
diff --git a/packages/tls/tls.0.3.0/opam b/packages/tls/tls.0.3.0/opam
new file mode 100644
index 00000000..5ac6ab04
--- /dev/null
+++ b/packages/tls/tls.0.3.0/opam
@@ -0,0 +1,32 @@
+opam-version: "1.2"
+name:         "tls"
+version:      "0.3.0"
+homepage:     "https://github.com/mirleft/ocaml-tls"
+dev-repo:     "https://github.com/mirleft/ocaml-tls.git"
+bug-reports:  "https://github.com/mirleft/ocaml-tls/issues"
+author:       ["David Kaloper <david@numm.org>" "Hannes Mehnert <hannes@mehnert.org>"]
+maintainer:   ["Hannes Mehnert <hannes@mehnert.org>" "David Kaloper <david@numm.org>"]
+license:      "BSD2"
+
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix
+    "--%{lwt:enable}%-lwt"
+    "--%{mirage-types+io-page+ipaddr:enable}%-mirage" ]
+  ["ocaml" "setup.ml" "-build"]
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: ["ocamlfind" "remove" "tls"]
+
+depends: [
+  "ocamlfind"
+  "cstruct" {>= "1.2.0"}
+  "type_conv"
+  "sexplib"
+  "nocrypto" {>= "0.3.0"}
+  "x509" {>= "0.2.1"}
+]
+depopts: [
+  "lwt"
+  "mirage-types-lwt"
+]
+conflicts: [ "mirage-types-lwt" {<"2.2.0"} ]
diff --git a/packages/tls/tls.0.3.0/url b/packages/tls/tls.0.3.0/url
new file mode 100644
index 00000000..d4db5292
--- /dev/null
+++ b/packages/tls/tls.0.3.0/url
@@ -0,0 +1 @@
+archive: "https://github.com/talex5/ocaml-tls.git#errors"
diff --git a/packages/x509/x509.0.2.1/descr b/packages/x509/x509.0.2.1/descr
new file mode 100644
index 00000000..e8211a6c
--- /dev/null
+++ b/packages/x509/x509.0.2.1/descr
@@ -0,0 +1,4 @@
+X.509 certificate (RFC5280) library
+
+Library for X.509 certificate parsing, serialization and authentication.
+Supports path validation (RFC5280) and hostname verification (RFC6125).
diff --git a/packages/x509/x509.0.2.1/findlib b/packages/x509/x509.0.2.1/findlib
new file mode 100644
index 00000000..490a5d71
--- /dev/null
+++ b/packages/x509/x509.0.2.1/findlib
@@ -0,0 +1 @@
+x509
diff --git a/packages/x509/x509.0.2.1/opam b/packages/x509/x509.0.2.1/opam
new file mode 100644
index 00000000..f37049fe
--- /dev/null
+++ b/packages/x509/x509.0.2.1/opam
@@ -0,0 +1,27 @@
+opam-version: "1.2"
+name:         "x509"
+version:      "0.2.1"
+homepage:     "https://github.com/mirleft/ocaml-x509"
+dev-repo:     "https://github.com/mirleft/ocaml-x509.git"
+bug-reports:  "https://github.com/mirleft/ocaml-x509/issues"
+author:       [ "David Kaloper <david@numm.org>" "Hannes Mehnert <hannes@mehnert.org>" ]
+maintainer:   [ "Hannes Mehnert <hannes@mehnert.org>" "David Kaloper <david@numm.org>" ]
+license:      "BSD2"
+
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix ]
+  ["ocaml" "setup.ml" "-build"]
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: ["ocamlfind" "remove" "x509"]
+
+depends: [
+  "ocamlfind"
+  "cstruct" {>= "1.2.0"}
+  "type_conv"
+  "sexplib"
+  "asn1-combinators" {>= "0.1.1"}
+  "nocrypto" {>= "0.2.0"}
+]
+tags: [ "org:mirage" ]
+available: [ ocaml-version >= "4.01.0" ]
diff --git a/packages/x509/x509.0.2.1/url b/packages/x509/x509.0.2.1/url
new file mode 100644
index 00000000..8fa6b1da
--- /dev/null
+++ b/packages/x509/x509.0.2.1/url
@@ -0,0 +1 @@
+archive: "https://github.com/mirleft/ocaml-x509.git"
diff --git a/packages/xentropyd/xentropyd.0.9.1/descr b/packages/xentropyd/xentropyd.0.9.1/descr
deleted file mode 100644
index c3577adf..00000000
--- a/packages/xentropyd/xentropyd.0.9.1/descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Xentropyd: provide entropy to Xen VMs
-
-It is difficult to find good entropy sources in a virtualised environment.
-Xentropyd watches for domains being created and connects to them, offering
-them entropy. This is similar to virtio-rng.
diff --git a/packages/xentropyd/xentropyd.0.9.1/opam b/packages/xentropyd/xentropyd.0.9.1/opam
deleted file mode 100644
index b0066483..00000000
--- a/packages/xentropyd/xentropyd.0.9.1/opam
+++ /dev/null
@@ -1,30 +0,0 @@
-opam-version: "1"
-maintainer: "dave.scott@citrix.com"
-build: [
-  [ "ocaml" "setup.ml" "-configure" ]
-  [ "ocaml" "setup.ml" "-build" ]
-  [ "cp" "main.native" "%{bin}%/xentropyd" ]
-]
-depends: [
-  "cstruct" {>= "0.6.0"}
-  "lwt"
-  "sexplib"
-  "ocamlfind"
-  "io-page"
-  "xen-evtchn"
-  "xen-gnt"
-  "shared-memory-ring"
-  "cmdliner"
-  "cstruct"
-  "mirage-clock-unix"
-  "mirage-types"
-  "ipaddr"
-  "uri"
-  "stringext"
-]
-depexts: [
-  [["debian"] ["libxen-dev" "uuid-dev"]]
-  [["ubuntu"] ["libxen-dev" "uuid-dev"]]
-  [["centos"] ["xen-devel"]]
-  [["xenserver"] ["xen-dom0-libs-devel" "xen-libs-devel"]]
-]
diff --git a/packages/xentropyd/xentropyd.0.9.1/url b/packages/xentropyd/xentropyd.0.9.1/url
deleted file mode 100644
index 472fcfee..00000000
--- a/packages/xentropyd/xentropyd.0.9.1/url
+++ /dev/null
@@ -1,2 +0,0 @@
-archive: "https://github.com/mirage/xentropyd/archive/v0.9.1.tar.gz"
-checksum: "e56914ae847fc280e66d836a3d8fba4a"