diff --git a/website/source/docs/concepts/pgp-gpg-keybase.html.md b/website/source/docs/concepts/pgp-gpg-keybase.html.md
new file mode 100644
index 0000000000..70c961c37e
--- /dev/null
+++ b/website/source/docs/concepts/pgp-gpg-keybase.html.md
@@ -0,0 +1,154 @@
+---
+layout: "docs"
+page_title: "Using PGP, GPG, and Keybase"
+sidebar_current: "docs-concepts-pgp-gpg-keybase"
+description: |-
+ Vault has the ability to integrate with GPG and services like Keybase.io to
+ provide an additional layer of security when performing certain operations.
+ This page details the various GPG integrations, their use, and operation.
+---
+
+# Using PGP, GPG, and Keybase
+
+Vault has the ability to integrate with GPG and services like Keybase to
+provide an additional layer of security when performing certain operations.
+This page details the various GPG integrations, their use, and operation.
+
+## Initializing with GPG
+One of the fundamental problems when bootstrapping and initializing the Vault
+is that the first user (the initializer) received a plain-text copy of all the
+unseal keys. This defeats the promises of Vault's security model, and it also
+makes the distribution of those keys more difficult. Since Vault 0.3, the
+Vault can optionally be initialized using GPG keys. In this mode, Vault will
+generate the unseal keys and then immediately encrypt them using the given
+users' GPG public keys. Only the owner of the corresponding private key is then
+able to decrypt the value, revealing the plain-text unseal key.
+
+First, you must create, acquire, or import the appropriate GPG onto the local
+machine from which you are initializing the vault. This guide will not attempt
+to cover all aspects of GPG keys. For more information, please see the
+[GPG manual](https://gnupg.org/gph/en/manual.html).
+
+To create a new GPG key, run, following the prompts:
+
+```
+$ gpg --gen-key
+```
+
+To import an existing key, download the public key onto disk and run:
+
+```
+$ gpg --import key.asc
+```
+
+Once you have imported the users' public GPG keys, you need to save their values
+to disk as either base64 or binary key files. For example:
+
+```
+$ gpg --export 348FFC4C | base64 > seth.asc
+```
+
+These key files must exist on disk in base64 or binary. Once saved to disk, the
+path to these files can be specified as an argument to the `-pgp-keys` flag.
+
+```
+$ vault init -key-shares=3 -key-threshold=2 \
+ -pgp-keys="jeff.asc,vishal.asc,seth.asc"
+```
+
+The result should look something like this:
+
+```
+Key 1: c1c04c03d5f43b6432ea77f3010800...
+Key 2: 612b611295f255baa2eb702a5e254f...
+Key 3: ebfd78302325e2631bcc21e11cae00...
+...
+```
+
+The output should be rather long in comparison to a regular unseal key. These
+keys are encrypted, and only the user holding the corresponding private key
+can decrypt the value. The keys are encrypted in the order in which specified
+in the `-pgp-keys` attribute. As such, the first key belongs to Jeff, the second
+to Vishal, and the third to Seth. These keys can be distributed over almost any
+medium, although common sense and judgement are best advised.
+
+### Unsealing with a GPG key
+Assuming you have been given a GPG key that was encrypted using your GPG public
+key, you are now tasked with entering your unseal key. To get the plain-text
+unseal key, you must decrypt the value given to you by the initializer. To get
+the plain-text value, run the following command:
+
+```
+$ echo "c1c0..." | xxd -r -p | gpg -d
+```
+
+And replace `c1c0...` with the encrypted key.
+
+If you encrypted your key with a passphrase, you may be prompted to enter it.
+After you enter your password, the output will be the plain-text key:
+
+```
+6ecb46277133e04b29bd0b1b05e60722dab7cdc684a0d3ee2de50ce4c38a357101
+```
+
+This is your unseal key in plain-text and should be guarded the same way you
+guard a password. Now you can enter your key to the `unseal` command:
+
+```
+$ vault unseal
+Key (will be hidden): ...
+```
+
+- - -
+
+## Initializing with Keybase
+[Keybase.io](https://keybase.io) is a popular online service that aims to verify
+and prove users' identies using a number of online sources. Keybase also exposes
+the ability for users to have PGP keys generated, stored, and managed securely
+on their servers.
+
+To generate unseal keys for keybase users, Vault accepts the `keybase:` prefix
+to the `-pgp-keys` argument:
+
+```
+$ vault init -key-shares=3 -key-threshold=2 \
+ -pgp-keys="keybase:jefferai,keybase:vishalnayak,keybase:sethvargo"
+```
+
+This requires far fewer steps that traditional GPG because keybase handles a
+few of the tedious steps. The output will be the similar to the following:
+
+```
+Key 1: c1c04c03d5f43b6432ea77f3010800...
+Key 2: 612b611295f255baa2eb702a5e254f...
+Key 3: ebfd78302325e2631bcc21e11cae00...
+...
+```
+
+### Unsealing with Keybase
+As a user, you must have the keybase CLI tool installed. You can download it
+from [keybase.io](https://keybase.io). After you have downloaded and configured
+the keybase CLI, you are now tasked with entering your unseal key. To get the
+plain-text unseal key, you must decrypt the value given to you by the
+initializer. To get the plain-text value, run the following command:
+
+```
+$ echo "c1c0..." | xxd -r -p | keybase pgp decrypt
+```
+
+And replace `c1c0...` with the encrypted key.
+
+You will be prompted to enter your keybase passphrase. The output will be the
+plain-text unseal key.
+
+```
+6ecb46277133e04b29bd0b1b05e60722dab7cdc684a0d3ee2de50ce4c38a357101
+```
+
+This is your unseal key in plain-text and should be guarded the same way you
+guard a password. Now you can enter your key to the `unseal` command:
+
+```
+$ vault unseal
+Key (will be hidden): ...
+```
diff --git a/website/source/docs/http/sys-init.html.md b/website/source/docs/http/sys-init.html.md
index d05f01bc67..60806397d9 100644
--- a/website/source/docs/http/sys-init.html.md
+++ b/website/source/docs/http/sys-init.html.md
@@ -61,8 +61,8 @@ description: |-
This must be less than or equal to secret_shares.