diff --git a/packages/user-setup/user-setup.0.6/descr b/packages/user-setup/user-setup.0.6/descr
new file mode 100644
index 00000000000..9e489b83dc5
--- /dev/null
+++ b/packages/user-setup/user-setup.0.6/descr
@@ -0,0 +1,14 @@
+Helper for the configuration of editors for the use of OCaml tools
+
+This tool knows about several editors, and several OCaml editing tools existing
+as opam packages. It automates the configuration of these editors, providing
+base templates when appropriate, and suitably installing the editing tools in
+the editor's configuration.
+
+For example, it will configure your emacs or Vim to indent OCaml files using
+[ocp-indent](http://www.typerex.org/ocp-indent.html) if you have that installed.
+
+Opam-user-setup is designed to be suitable both to beginners not wanting to be
+bothered with configuration files, and to people who manage them carefully.
+
+It's customisable and reversible.
diff --git a/packages/user-setup/user-setup.0.6/opam b/packages/user-setup/user-setup.0.6/opam
new file mode 100644
index 00000000000..0b61ebbe932
--- /dev/null
+++ b/packages/user-setup/user-setup.0.6/opam
@@ -0,0 +1,20 @@
+opam-version: "1.2"
+maintainer: "Louis Gesbert <louis.gesbert@ocamlpro.com>"
+authors: "Louis Gesbert <louis.gesbert@ocamlpro.com>"
+homepage: "https://github.com/AltGr/opam-user-setup"
+bug-reports: "https://github.com/AltGr/opam-user-setup/issues"
+license: "ISC"
+dev-repo: "https://github.com/AltGr/opam-user-setup.git"
+build: [make]
+depends: [
+  "ocamlfind" {build}
+  "cmdliner"
+  "re"
+]
+depopts: ["tuareg" "merlin" "ocp-indent" "ocp-index"]
+available: [ocaml-version >= "4.00"]
+post-messages: [
+  "To setup or update your editors, run 'opam user-setup install'."
+    {success}
+]
+tags: [ "org:ocamlpro" "flags:plugin" ]
diff --git a/packages/user-setup/user-setup.0.6/url b/packages/user-setup/user-setup.0.6/url
new file mode 100644
index 00000000000..b3f6e8db5bd
--- /dev/null
+++ b/packages/user-setup/user-setup.0.6/url
@@ -0,0 +1,2 @@
+src: "https://github.com/OCamlPro/opam-user-setup/archive/0.6.tar.gz"
+checksum: "223d53b4d6bd61b5f4fee9cad128573d"