diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfbeffad1..3daec0dbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -495,12 +495,17 @@ opam:48:tezos-protocol-demo:
   variables:
     package: tezos-protocol-demo
 
-opam:49:tezos-node:
+opam:49:tezos-signer:
+  <<: *opam_definition
+  variables:
+    package: tezos-signer
+
+opam:50:tezos-node:
   <<: *opam_definition
   variables:
     package: tezos-node
 
-opam:50:ocplib-json-typed-browser:
+opam:51:ocplib-json-typed-browser:
   <<: *opam_definition
   variables:
     package: ocplib-json-typed-browser
diff --git a/Makefile b/Makefile
index b268871e1..efff306fa 100644
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,13 @@ all:
 		src/bin_node/main.exe \
 		src/bin_client/main_client.exe \
 		src/bin_client/main_admin.exe \
-		src/bin_client/main_signer.exe \
+		src/bin_signer/main_signer.exe \
 		src/lib_protocol_compiler/main_native.exe \
 		src/proto_alpha/bin_baker/main_baker_alpha.exe
 	@cp _build/default/src/bin_node/main.exe tezos-node
 	@cp _build/default/src/bin_client/main_client.exe tezos-client
 	@cp _build/default/src/bin_client/main_admin.exe tezos-admin-client
-	@cp _build/default/src/bin_client/main_signer.exe tezos-signer
+	@cp _build/default/src/bin_signer/main_signer.exe tezos-signer
 	@cp _build/default/src/lib_protocol_compiler/main_native.exe tezos-protocol-compiler
 	@cp _build/default/src/proto_alpha/bin_baker/main_baker_alpha.exe tezos-alpha-baker
 
diff --git a/src/bin_client/jbuild b/src/bin_client/jbuild
index 8b9cd5e8a..dc517a264 100644
--- a/src/bin_client/jbuild
+++ b/src/bin_client/jbuild
@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (executables
- ((names (main_client main_admin main_signer))
-  (public_names (tezos-client tezos-admin-client tezos-signer))
+ ((names (main_client main_admin))
+  (public_names (tezos-client tezos-admin-client))
   (libraries (tezos-base
               tezos-rpc-http
               tezos-shell-services
diff --git a/src/bin_signer/jbuild b/src/bin_signer/jbuild
new file mode 100644
index 000000000..dca8e036a
--- /dev/null
+++ b/src/bin_signer/jbuild
@@ -0,0 +1,24 @@
+(jbuild_version 1)
+
+(executables
+ ((names (main_signer))
+  (public_names (tezos-signer))
+  (libraries (tezos-base
+              tezos-client-base
+              tezos-client-base-unix
+              tezos-client-commands
+              tezos-rpc-http
+              tezos-stdlib-unix))
+  (flags (:standard -w -9+27-30-32-40@8
+                    -safe-string
+                    -open Tezos_base__TzPervasives
+                    -open Tezos_client_base
+                    -open Tezos_client_base_unix
+                    -open Tezos_client_commands
+                    -open Tezos_rpc_http
+                    -open Tezos_stdlib_unix))))
+
+(alias
+ ((name runtest_indent)
+  (deps ((glob_files *.ml*)))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
diff --git a/src/bin_client/main_signer.ml b/src/bin_signer/main_signer.ml
similarity index 100%
rename from src/bin_client/main_signer.ml
rename to src/bin_signer/main_signer.ml
diff --git a/src/bin_signer/main_signer.mli b/src/bin_signer/main_signer.mli
new file mode 100644
index 000000000..94d7d521e
--- /dev/null
+++ b/src/bin_signer/main_signer.mli
@@ -0,0 +1,10 @@
+(**************************************************************************)
+(*                                                                        *)
+(*    Copyright (c) 2014 - 2018.                                          *)
+(*    Dynamic Ledger Solutions, Inc. <contact@tezos.com>                  *)
+(*                                                                        *)
+(*    All rights reserved. No warranty, explicit or implicit, provided.   *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* empty *)
diff --git a/src/bin_signer/tezos-signer.opam b/src/bin_signer/tezos-signer.opam
new file mode 100644
index 000000000..8d1f66c55
--- /dev/null
+++ b/src/bin_signer/tezos-signer.opam
@@ -0,0 +1,27 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & = "1.0+beta19.1" }
+  "tezos-base"
+  "tezos-client-base"
+  "tezos-client-genesis"
+  "tezos-client-alpha"
+  "tezos-client-alpha-commands"
+  "tezos-baking-alpha"
+  "tezos-baking-alpha-commands"
+  "tezos-client-base-unix"
+  "tezos-node" { test }
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]