diff --git a/config.py b/config.py
index 2d278dd..205be92 100644
--- a/config.py
+++ b/config.py
@@ -67,11 +67,14 @@ with open(os.path.join(KEY_DIR, "me.yml")) as f:
     ID = BASE_URL
     SUMMARY = conf["summary"]
     ICON_URL = conf["icon_url"]
+    FAVICON_URL = conf.get("favicon_url", "/static/favicon.png")
     PASS = conf["pass"]
 
     PROFILE_METADATA = conf.get("profile_metadata", {})
     HIDE_FOLLOWING = conf.get("hide_following", True)
 
+    ALIASES = conf.get('aliases', [])
+
     # Theme-related config
     theme_conf = conf.get("theme", {})
     THEME_STYLE = ThemeStyle(theme_conf.get("style", DEFAULT_THEME_STYLE))
@@ -161,6 +164,7 @@ ME = {
         "url": ICON_URL,
     },
     "publicKey": KEY.to_dict(),
+    "alsoKnownAs": ALIASES,
 }
 
 # Default emojis, space-separated, update `me.yml` to customize emojis
diff --git a/config/me.sample.yml b/config/me.sample.yml
index 56e37b0..54e64eb 100644
--- a/config/me.sample.yml
+++ b/config/me.sample.yml
@@ -1,6 +1,20 @@
 username: 'username'
 name: 'You Name'
-icon_url: 'https://you-avatar-url'
 domain: 'your-domain.tld'
-summary: 'your summary'
 https: true
+summary: 'your summary'
+icon_url: 'https://you-avatar-url'
+pass: '<bcrypt password hash>'
+#favicon_url: '/static/favicon.png'
+#profile_metadata:
+#    name1: 'value'
+#    name2: 'value2'
+#hide_following: true
+#manually_approves_followers: false
+#aliases:
+#    - "http://example.com/users/name"
+#    - ...
+#theme:
+#    style: "light" #or "dark"
+#    color: "#1d781d" # (green, default for light)
+          # "#33ff00"   (purple, default for dark)
diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644
index 0000000..644d6e8
Binary files /dev/null and b/static/favicon.png differ
diff --git a/templates/layout.html b/templates/layout.html
index 7f386c6..3b084ee 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -5,6 +5,7 @@
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <title>{% block title %}{{ config.NAME }}'s microblog{% endblock %}</title>
+<link rel="icon" type="image/png" href="{{ config.FAVICON_URL }}">
 <link rel="stylesheet" href="/static/pure.css">
 <link rel="authorization_endpoint" href="{{ config.ID }}/indieauth">
 <link rel="token_endpoint" href="{{ config.ID }}/token">