diff --git a/README.md b/README.md
index 8616445409..98b6afbcbe 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,11 @@ Remove key:
 
     ./bin/gitlab-keys rm-key key-23 "ssh-rsa AAAAx321..."
 
+List all keys:
+
+    ./bin/gitlab-keys list-keys
+
+
 Remove all keys from authorized_keys file:
 
     ./bin/gitlab-keys clear
diff --git a/bin/gitlab-keys b/bin/gitlab-keys
index 2f53a711e2..9eb19503ea 100755
--- a/bin/gitlab-keys
+++ b/bin/gitlab-keys
@@ -12,6 +12,8 @@ require_relative '../lib/gitlab_init'
 #
 #   /bin/gitlab-keys rm-key key-23 "ssh-rsa AAAAx321..."
 #
+#   /bin/gitlab-keys list-keys
+#   
 #   /bin/gitlab-keys clear
 #
 
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 3bdf6c61f2..100e16472e 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -19,6 +19,7 @@ def exec
     when 'add-key'; add_key
     when 'batch-add-keys'; batch_add_keys
     when 'rm-key';  rm_key
+    when 'list-keys'; puts list_keys
     when 'clear';  clear
     else
       $logger.warn "Attempt to execute invalid gitlab-keys command #{@command.inspect}."
@@ -38,6 +39,19 @@ def add_key
     true
   end
 
+  def list_keys
+    $logger.info 'Listing all keys'
+    keys = ''
+    File.readlines(auth_file).each do |line|
+      # key_id & public_key
+      # command=".../bin/gitlab-shell key-741" ... ssh-rsa AAAAB3NzaDAxx2E\n
+      #                               ^^^^^^^              ^^^^^^^^^^^^^^^
+      matches = /^command=\".+?\s+(.+?)\".+?ssh-rsa\s(.+)\s*.*\n*$/.match(line)
+      keys << "#{matches[1]} #{matches[2]}\n" unless matches.nil?
+    end
+    keys
+  end
+
   def batch_add_keys
     lock do
       open(auth_file, 'a') do |file|
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb
index aaaee1517b..bcce628e82 100644
--- a/spec/gitlab_keys_spec.rb
+++ b/spec/gitlab_keys_spec.rb
@@ -41,6 +41,19 @@
     end
   end
 
+  describe :list_keys do
+    let(:gitlab_keys) do
+      build_gitlab_keys('add-key', 'key-741', 'ssh-rsa AAAAB3NzaDAxx2E')
+    end
+
+    it 'adds a key and lists it' do
+      create_authorized_keys_fixture
+      gitlab_keys.send :add_key
+      auth_line1 = 'key-741 AAAAB3NzaDAxx2E'
+      gitlab_keys.send(:list_keys).should == "#{auth_line1}\n"
+    end
+  end
+
   describe :batch_add_keys do
     let(:gitlab_keys) { build_gitlab_keys('batch-add-keys') }
     let(:fake_stdin) { StringIO.new("key-12\tssh-dsa ASDFASGADG\nkey-123\tssh-rsa GFDGDFSGSDFG\n", 'r') }