diff --git a/.etckeeper b/.etckeeper
index 9be168c0..17610fd3 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -12,6 +12,7 @@ mkdir -p './dhcp/.git/branches'
 mkdir -p './dhcp/.git/objects/info'
 mkdir -p './dhcp/.git/objects/pack'
 mkdir -p './dhcp/.git/refs/tags'
+mkdir -p './elinks'
 mkdir -p './fail2ban/fail2ban.d'
 mkdir -p './initramfs-tools/conf.d'
 mkdir -p './initramfs-tools/hooks'
@@ -360,6 +361,7 @@ maybe chmod 0644 'dpkg/origins/debian'
 maybe chmod 0644 'dpkg/origins/raspbian'
 maybe chmod 0644 'dpkg/shlibs.default'
 maybe chmod 0644 'dpkg/shlibs.override'
+maybe chmod 0755 'elinks'
 maybe chmod 0644 'email-addresses'
 maybe chmod 0644 'environment'
 maybe chmod 0755 'etckeeper'
diff --git a/alternatives/www-browser b/alternatives/www-browser
new file mode 120000
index 00000000..2405bcb4
--- /dev/null
+++ b/alternatives/www-browser
@@ -0,0 +1 @@
+/usr/bin/elinks
\ No newline at end of file
diff --git a/alternatives/www-browser.1.gz b/alternatives/www-browser.1.gz
new file mode 120000
index 00000000..75a7b25f
--- /dev/null
+++ b/alternatives/www-browser.1.gz
@@ -0,0 +1 @@
+/usr/share/man/man1/elinks.1.gz
\ No newline at end of file
diff --git a/mailcap b/mailcap
index b8f1b311..6554c6a9 100644
--- a/mailcap
+++ b/mailcap
@@ -50,7 +50,9 @@ text/x-tex; vim %s; needsterminal
 application/x-shellscript; vim %s; needsterminal
 text/x-c; vim %s; needsterminal
 text/x-c++; vim %s; needsterminal
+text/html; /usr/bin/elinks -force-html %s; needsterminal; description=HTML Text; nametemplate=%s.html
 text/plain; view %s; edit=vim %s; compose=vim %s; test=test -x /usr/bin/vim; needsterminal
+text/html; /usr/bin/elinks -force-html -dump %s; copiousoutput; description=HTML Text; nametemplate=%s.html
 application/zip; unzip -l %s; nametemplate=%s.zip; copiousoutput
 text/plain; view %s; edit=vi %s; compose=vi %s; needsterminal
 application/x-troff-man; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page