diff --git a/site/projects/dispass.el.org b/site/projects/dispass.el.org
index 0d071ce..c04c267 100644
--- a/site/projects/dispass.el.org
+++ b/site/projects/dispass.el.org
@@ -1,64 +1,70 @@
 #+TITLE: dispass.el
-#+LINK: src    http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/
-#+LINK: tar_gz http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/snapshot/dispass.el-master.tar.gz
-#+LINK: zip    http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/snapshot/dispass.el-master.zip
-#+LINK: readme http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/about/
-#+LINK: manual http://ryuslash.org/projects/dispass.el/manual/
-#+LINK: dispass http://dispass.babab.nl
 #+STARTUP: showall
-
-#+begin_html
-  <script src="/keyjs.js" 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"
+#+MACRO: version 1.1.2
 
 * What does it do?
 
-  [[dispass][DisPass]] is a passphrase generator. ~dispass.el~ is an [[emacs][Emacs]] wrapper
-  for [[dispass][DisPass]].
+  [[http://dispass.babab.nl][DisPass]] is a passphrase generator. ~dispass.el~ is an [[http://gnu.org/software/emacs][Emacs]] wrapper
+  for DisPass. It tries to improve upon the user interface(s) provided
+  by DisPass by being an Emacs module, automatically copying generated
+  passphrases to your clipboard, providing label completion and
+  enabling easy management of labels.
 
-* Why was it written?
-
-  [[dispass][DisPass]] is written by a [[http://babab.nl][friend]] of mine and I really liked the idea
-  of it. But the interface he had for it was not to my liking, it was
+  DisPass is written by a [[http://babab.nl][friend]] of mine and I really liked the idea
+  of it. But the interface he had for it was not to my liking: it was
   not Emacs.
 
-** Why the license?
+  It offers:
 
-   Since [[dispass][DisPass]] uses the ISC license, I thought it would be polite
-   to use the same license.
+  - Copying passwords directly to the clipboard, no need for manual
+    selection and copying.
 
-* Who is it for?
+  - Specifying the length of the passphrase by using a numeric prefix
+    argument.
 
-  Anyone who prefers to use emacs as a universal interface and also
-  likes to use [[dispass][DisPass]].
+  - Input completion for labels.
 
-* Data
+  - Some label management (adding, removing).
 
-  | Version  | 0 (development only) |
-  | Language | Emacs Lisp           |
-  | License  | ISC                  |
+* Alternatives
 
-** Features
+  DisPass provides its own command-line-based interface and a Tk-based
+  GUI and I also have a [[http://conkeror.org][Conkeror]] interface project for it. These all
+  suffer from not being Emacs modules and are thus unusable.
 
-   - 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.
-   - Input completion for labels.
-   - Some label management (adding, removing).
+* Requirements
 
-** Dependencies
+  Obviously it requires both [[http://dispass.babab.nl][DisPass]] and [[http://gnu.org/software/emacs][Emacs]]. Beyond that there
+  shouldn't be any requirements.
 
-   - [[emacs][Emacs]] :: Probably version 24+, since that is what it's being
-              developed on.
-   - [[dispass][DisPass]] :: At least v0.1a8, best is a recent git version.
+* Download
 
-* More...
+  You can browse the [[https://github.com/dispass/dispass.el][git source]], download a snapshot [[https://github.com/dispass/dispass.el/archive/master.tar.gz][tar.gz]] or [[https://github.com/dispass/dispass.el/archive/master.zip][zip]]
+  archive or install a snapshot using [[http://melpa.milkbox.net/][MELPA]]. *Note:* The snapshots
+  require a recent snapshot from the DisPass git sources, they won't
+  work with the latest DisPass release.
 
-  For further instructions I would refer you to the [[readme][README]] and [[manual]].
+  You can download the latest release, v{{{version}}}, as a [[https://github.com/dispass/dispass.el/archive/1.1.2.tar.gz][tar.gz]] or
+  [[https://github.com/dispass/dispass.el/archive/1.1.2.zip][zip]] archive or install it using [[http://marmalade-repo.org][Marmalade]]. *Note:* v{{{version}}}
+  needs DisPass v0.2.0, it won't work with recent snapshots from the
+  git sources.
+
+* License
+
+  dispass.el is released under the ISC license. The license can be
+  found in the header of the [[https://github.com/dispass/dispass.el/blob/master/dispass.el][source]] file (or follow the link).
+
+  Since DisPass uses the ISC license, I thought it would be polite to
+  use the same license.
+
+* Documentation
+
+  For further instructions on how to use dispass.el, see the [[https://github.com/dispass/dispass.el/blob/master/README.org][README]]
+  in the source directory (or follow the link).
+
+* Contact
+
+  If you find any bugs, have suggestions or criticisms you can send
+  them to [[mailto:tom@ryuslash.org][tom@ryuslash.org]] or send a message to the
+  [[mailto:dispass@librelist.com][dispass@librelist.com]] mailing list (your first message is your
+  registration and will be dropped).