Merge commit 'jrollins/master'

Conflicts:
	website/download.mdwn

diff --cc website/download.mdwn
index 543d4e91b74f9930b95378037e336fceb3a958e0,b0c45b88ef50186f7763cb5f3fc0cfb531b45ed0..3cf9d62063d6a5c5fadf51c83181f11fc0958675
--- 1/website/download.mdwn
--- 2/website/download.mdwn
+++ b/website/download.mdwn
@@@ -18,8 -18,13 +18,16 @@@ Monkeysphere relies on
  ## Debian ##
  
  If you are running a [Debian](http://www.debian.org/) system, the
- [monkeysphere is available in the Debian archive, and as a backport](http://packages.debian.org/search?keywords=monkeysphere&searchon=names&section=all&suite=all)
 -[monkeysphere is available in the Debian testing ("squeeze")
 -distribution](http://packages.debian.org/testing/monkeysphere).  If
 -you are running Debian testing, install the latest monkeysphere
 -version:
++[monkeysphere is available in the Debian archive](http://packages.debian.org/search?keywords=monkeysphere&searchon=names&section=all&suite=all)
++
++If you are running Debian unstable or testing install the latest monkeysphere
++version as follows:
+ 
+     aptitude install monkeysphere
+ 
++If you are running Debian stable, you can get the monkeysphere package
++from [backports.org](http://backports.org/dokuwiki/doku.php?id=instructions)
 +
  You can also install the Monkeysphere directly from the Monkeysphere
  Debian archive.  You can add this archive to your system by putting
  the following lines in `/etc/apt/sources.list.d/monkeysphere.list`: