diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e5eae..61b90d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Support for signature profiles
+- Robots.txt
+- Noindex meta tags on profile pages
 ### Changed
 - Allow setting of custom HKP server
+## Fixed
+- Render error messages when error is object
 
 ## [2.3.4] - 2021-01-02
 ### Fixed
diff --git a/index.js b/index.js
index d920c9e..e8f3e65 100644
--- a/index.js
+++ b/index.js
@@ -44,6 +44,7 @@ app.set('keyoxide_version', packageData.version);
 app.set('onion_url', process.env.ONION_URL);
 
 app.use('/favicon.svg', express.static('favicon.svg'));
+app.use('/robots.txt', express.static('robots.txt'));
 
 app.use(stringReplace({
     PLACEHOLDER__XMPP_VCARD_SERVER_DOMAIN: process.env.XMPP_VCARD_SERVER_DOMAIN || 'xmpp-vcard.keyoxide.org'
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000..1af201e
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,6 @@
+User-agent: *
+Allow: /$
+Allow: /guides
+Allow: /getting-started
+Allow: /faq
+Disallow: /
\ No newline at end of file
diff --git a/views/profile.pug b/views/profile.pug
index 83c02f4..fb7ade5 100644
--- a/views/profile.pug
+++ b/views/profile.pug
@@ -2,6 +2,7 @@ doctype html
 head
   meta(charset='utf-8')
   meta(name='viewport' content='width=device-width, initial-scale=1')
+  meta(name='robots' content='noindex')
   link(rel='shortcut icon' href='/favicon.svg')
   title Keyoxide
   link(rel='stylesheet' href='/static/styles.css')