--- a/thesis/bib/websites.bib	Thu Jan 15 16:59:18 2009 +0100
+++ b/thesis/bib/websites.bib	Thu Jan 15 22:44:44 2009 +0100
@@ -133,7 +133,7 @@
 }
 
 @misc{packages.debian:masqmail,
-	author = "Debian",
+	author = "The Debian Project",
 	title = "\emph{Details of package masqmail in lenny}",
 	howpublished = "On the Internet: {\small\url{http://packages.debian.org/lenny/masqmail} (2008-10-24)}",
 }
@@ -234,3 +234,61 @@
 	howpublished = "On the Internet: {\small\url{http://en.wikipedia.org/w/index.php?title=Simple_Mail_Transfer_Protocol&oldid=262937416} (2009-01-12)}",
 }
 
+@misc{ubuntuforums:simple-mailer,
+	author = "Reinhard Tartler and Derek Broughton et.al.",
+	title = "\emph{Wanted: simple mailer for laptop use}",
+	year = "2005",
+	month = "October",
+	howpublished = "On the Internet: {\small\url{http://ubuntuforums.org/showthread.php?t=82744} (2009-01-15)}",
+}
+
+@misc{stosberg:low-mem-laptop,
+	author = "Mark Stosberg",
+	title = "\emph{Adventures with Slackware Linux on a Low Memory Laptop}",
+	howpublished = "On the Internet: {\small\url{http://www.stosberg.com/Tech/slackware_on_lowlap.html} (2009-01-15)}",
+}
+
+
+@misc{packages.debian,
+	author = "The Debian Project",
+	title = "\emph{Debian -- Packages}",
+	howpublished = "On the Internet: {\small\url{http://packages.debian.org} (2009-01-15)}",
+}
+
+
+@misc{popcon.debian,
+	author = "The Debian Project",
+	title = "\emph{Popularity contest statistics for masqmail}",
+	howpublished = "On the Internet: {\small\url{http://popcon.debian.org} (2009-01-15)}",
+}
+
+@misc{popcon.debian:masqmail,
+	author = "The Debian Project",
+	title = "\emph{Debian Popularity Contest}",
+	howpublished = "On the Internet: {\small\url{http://qa.debian.org/popcon.php?package=masqmail} (2009-01-15)}",
+}
+
+@misc{popcon.ubuntu,
+	author = "The Ubuntu Project",
+	title = "\emph{Ubuntu Popularity Contest}",
+	howpublished = "On the Internet: {\small\url{http://qa.debian.org/popcon.php?package=masqmail} (2009-01-15)}",
+}
+
+
+
+@misc{debian:bug245882,
+	author = "Kyler Laird",
+	title = "\emph{spool files not completely removed upon delivery}",
+	year = "2004",
+	month = "April",
+	howpublished = "On the Internet: {\small\url{http://bugs.debian.org/245882} (2009-01-15)}",
+}
+
+@misc{debian:bug216226,
+	author = "Ralf Neubauer",
+	title = "\emph{big mails over slow links get sent multiple times}",
+	year = "2003",
+	month = "October",
+	howpublished = "On the Internet: {\small\url{http://bugs.debian.org/216226} (2009-01-15)}",
+}
+