diff --git a/.travis.yml b/.travis.yml
index 09abe02..e8d9959 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ script: bash -ex ./.travis-docker.sh
 env:
   global:
   - PACKAGE="mustache"
-  - PINS="mustache-unix:. mustache:."
+  - PINS="mustache:."
   matrix:
   - DISTRO="debian-stable" OCAML_VERSION="4.03"
   - DISTRO="debian-testing" OCAML_VERSION="4.04"
diff --git a/CHANGES.md b/CHANGES.md
index 2f9e649..a5e2341 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 ### 3.1.0
 
-* Add a `mustache-unix` package under which `mustache-cli` is installed. (@avsm)
+* Install `mustache` command line utility (@avsm, @anton-trunov)
 * Update opam metadata to 2.0 format (@avsm)
 * Port build to Dune (@avsm)
 * Fix ocamldoc syntax to be compatible with odoc (@avsm)
diff --git a/bin/dune b/bin/dune
index bd17b7f..679e9e7 100644
--- a/bin/dune
+++ b/bin/dune
@@ -1,7 +1,5 @@
 (executable
  (name mustache_cli)
- (public_name mustache-cli)
+ (public_name mustache)
  (modules mustache_cli)
- (package mustache-unix)
  (libraries mustache ezjsonm))
-
diff --git a/mustache-unix.opam b/mustache-unix.opam
deleted file mode 100644
index 111cd7e..0000000
--- a/mustache-unix.opam
+++ /dev/null
@@ -1,23 +0,0 @@
-opam-version: "2.0"
-maintainer: "rudi.grinberg@gmail.com"
-authors: ["Rudi Grinberg" "Armaël Guéneau"]
-license: "MIT"
-homepage: "https://github.com/rgrinberg/ocaml-mustache"
-doc: "http://rgrinberg.github.io/mustache/"
-bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
-depends: [
-  "ocaml" {>= "4.03"}
-  "dune" {build}
-  "base-unix"
-  "mustache"
-]
-build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-dev-repo: "git+https://github.com/rgrinberg/ocaml-mustache.git"
-synopsis: "Unix utilitie for Mustache logic-less templates in OCaml"
-description: """
-Contains the `mustache-cli` command line utility for driving
-Mustache logic-less templates.
-"""
diff --git a/mustache.opam b/mustache.opam
index 9872f20..7548133 100644
--- a/mustache.opam
+++ b/mustache.opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
 depends: [
   "ocaml" {>= "4.03"}
   "dune" {build}
+  "ezjsonm"
   "menhir"
   "ounit" {with-test}
-  "ezjsonm" {with-test}
 ]
 build: [
   ["dune" "subst"] {pinned}
@@ -21,4 +21,5 @@ dev-repo: "git+https://github.com/rgrinberg/ocaml-mustache.git"
 synopsis: "Mustache logic-less templates in OCaml"
 description: """
 Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.
 """