From ae686901896e4c1e0f48212577d4af0535ddf074 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Wed, 20 Aug 2014 17:04:41 +0200
Subject: [PATCH] Document user support key on OpenPGP keys page

---
 wiki/src/doc/about/openpgp_keys.mdwn | 33 +++++++++++++++++++++++++++++++++
 wiki/src/support/talk.html           |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/wiki/src/doc/about/openpgp_keys.mdwn b/wiki/src/doc/about/openpgp_keys.mdwn
index f09a1cdd6..818e10f8e 100644
--- a/wiki/src/doc/about/openpgp_keys.mdwn
+++ b/wiki/src/doc/about/openpgp_keys.mdwn
@@ -93,3 +93,36 @@ There are multiple ways to get this OpenPGP public key:
 
 If you already have Tails signing key but download it again, it can update the
 list of existing signatures of the key.
+
+<a id="support"></a>
+
+User support key
+================
+
+Purpose
+-------
+
+### Encryption
+
+  - Use this key to encrypt private support requests sent to <tails-support-private@boum.org>.
+  - This same key is used to handle [[*WhisperBack* reports|first_steps/bug_reporting]].
+
+Policy
+------
+
+The secret key material and its passphrase are stored on the server
+that runs our encrypted mailing-list software and on systems managed
+by core Tails developers.
+
+[[!tails_website tails-email.key desc="Download the key"]]
+
+Key details
+-----------
+
+    pub   4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]
+          Key fingerprint = 1F56 EDD3 0741 0480 35DA  C1C5 EC57 B56E F0C4 3132
+    uid                          Tails bug squad <tails-bugs@boum.org>
+    uid                          Tails bug squad (schleuder list) <tails-bugs-owner@boum.org>
+    uid                          Tails bug squad (schleuder list) <tails-bugs-request@boum.org>
+    uid                          Tails private user support <tails-support-private@boum.org>
+    sub   4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]
diff --git a/wiki/src/support/talk.html b/wiki/src/support/talk.html
index 2144aa8eb..3cf8235c0 100644
--- a/wiki/src/support/talk.html
+++ b/wiki/src/support/talk.html
@@ -44,7 +44,7 @@ GNU/Linux and Mac OS X.</p>
 
 <p>[[tails-support-private@boum.org|mailto:tails-support-private@boum.org]]</p>
 
-<p>Encrypting your emails with our [[OpenPGP key|tails-bugs.key]] is the only way to achieve
+<p>Encrypting your emails with our [[OpenPGP key|doc/about/openpgp_keys#support]] is the only way to achieve
 end-to-end encryption.</p>
 
 </div>
-- 
2.11.4.GIT