diff --git a/site/index.org b/site/index.org
index 5240fe4..56720e6 100644
--- a/site/index.org
+++ b/site/index.org
@@ -24,7 +24,7 @@
   I was born in the Netherlands, live in Belgium and work for a dutch
   company. I have been using GNU/Linux since 2008, having settled on
   [[http://www.archlinux.org][Archlinux]] after trying [[http://www.ubuntu.com][Ubuntu]], [[http://fedoraproject.org][Fedora]] and [[http://zenwalk.org][Zenwalk]]. I have been using
-  [[http://www.gnu.org][GNU Emacs]] since not long after switching over to GNU/Linux.
+  [[emacs][GNU Emacs]] since not long after switching over to GNU/Linux.
 
   I can be contacted through email (tom at ryuslash dot org) or any
   other place you can find me, really.
@@ -40,12 +40,13 @@
 
 * Projects
 
-  - [[file:projects/git-auto-commit-mode.org][git-auto-commit-mode]] :: An Emacs minor mode for automatically
+  - [[file:projects/git-auto-commit-mode.org][git-auto-commit-mode]] :: An [[emacs][Emacs]] minor mode for automatically
        committing changes to a file.
   - [[file:projects/ryuslash.org][ryuslash.org]] :: My front page.
   - [[file:projects/eye-on-manga.org][eye-on-manga]] :: A manga collection manager for my N900 phone.
   - [[file:projects/org-blog.org][org-blog]] :: A continuation of David O'Toole's ~org-blog~ module for
-                emacs.
+                [[emacs][Emacs]].
+  - [[file:projects/dispass.el.org][dispass.el]] :: An [[emacs][Emacs]] wrapper for DisPass.
 
 * Dotfiles
 
@@ -55,9 +56,9 @@
   - [[http://org.ryuslash.org/dotfiles/emacs/init.html][Emacs]] :: My favorite editor.
   - [[http://org.ryuslash.org/dotfiles/Xdefaults/Xdefaults.html][Xdefaults]] :: Settings for multiple X programs.
   - [[http://org.ryuslash.org/dotfiles/Xmodmap/Xmodmap.html][Xmodmap]] :: X keyboard and mouse preferences.
-  - [[http://org.ryuslash.org/dotfiles/diary/diary.html][Diary]] :: A diary (appointments) file for emacs.
+  - [[http://org.ryuslash.org/dotfiles/diary/diary.html][Diary]] :: A diary (appointments) file for [[emacs][Emacs]].
   - [[http://org.ryuslash.org/dotfiles/sawfish/rc.html][Sawfish]] :: A very cool window manager, especially if you like
-               emacs.
+               [[emacs][Emacs]].
   - [[Beets]] :: A nifty little digital music collection manager.
   - [[http://org.ryuslash.org/dotfiles/cower/config.html][Cower]] :: A simple CLI for the [[https://aur.archlinux.org][Archlinux User Repository]].
   - [[http://org.ryuslash.org/dotfiles/pentadactyl/pentadactylrc.html][Pentadactyl]] :: A firefox extension for vi-like key-bindings.
diff --git a/site/projects/dispass.el.org b/site/projects/dispass.el.org
index b64a4ed..d8ec515 100644
--- a/site/projects/dispass.el.org
+++ b/site/projects/dispass.el.org
@@ -1 +1,58 @@
-#+TITLE: Dispass.el
+#+TITLE: dispass.el
+#+LINK_UP: ../index.html
+#+LINK_HOME: http://ryuslash.org
+#+LINK: src    https://github.com/ryuslash/dispass.el
+#+LINK: tar_gz https://github.com/ryuslash/dispass.el/tarball/master
+#+LINK: zip    https://github.com/ryuslash/dispass.el/zipball/master
+#+LINK: dispass http://dispass.babab.nl
+#+STARTUP: showall
+
+#+begin_html
+  <script src="/keyjs.KS" type="text/javascript"></script>
+  <script type="text/javascript">
+    keyjs_initialize({ "u": [ "keyjs_goto", "../index.html" ],
+                       "h": [ "keyjs_goto", "http://ryuslash.org" ] });
+  </script>
+#+end_html
+
+#+INCLUDE: "dlmenu.inc"
+
+* About
+
+  [[dispass][DisPass]] is a passphrase generator.  ~dispass.el~ is an [[emacs][Emacs]] wrapper
+  for [[dispass][DisPass]].
+
+** Features
+
+   - Copy passwords directly to the clipboard, no need for manual
+     selection and copying.
+   - Specify the length of the passphrase by using a numeric prefix
+     argument.
+
+** Requirements
+
+   - [[emacs][Emacs]]
+   - [[dispass][DisPass]]
+
+* Usage
+
+  First place ~dispass.el~ somewhere in your load path, or add its
+  location to your load path:
+
+  #+begin_src emacs-lisp
+    (add-to-list 'load-path "~/location/of/dispass.el")
+  #+end_src
+
+  Then you need to load it up:
+
+  #+begin_src emacs-lisp
+    (require 'dispass)
+  #+end_src
+
+  After that everything should be simple, either call =dispass= or
+  =dispass-create= to generate the passphrase. =dispass-create= will ask
+  for your password twice, for confirmation purposes.
+
+  To specify a length of the generated passphrase, use numeric prefix
+  arguments: =C-8 M-x dispass <RET>= to create a passphrase of 8
+  characters.