diff --git a/TODO b/TODO
deleted file mode 100644
index a804597b88..0000000000
--- a/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-* bug: cannot "git annex ../foo"   (GitRepo.relative is buggy and
-  git-ls-files also refuses w/o --full-name, which would need other changes)
-
-* --push/--pull should take a reponame and files, and push those files
-  to that repo; dropping them from the current repo
-
-* how to handle git mv file? -> git annex fix -> run automatically on commit
-
-* how to handle git rm file? (should try to drop keys that have no
-  referring file, if it seems safe..)
-
-* add a git annex fsck that finds keys that have no referring file
-
-* Support for remote git repositories (ssh:// specifically can be made to
-  work, although the other end probably needs to have git-annex installed..)
-
-* Find a way to copy a file with a progress bar, while still preserving 
-  stat. Easiest way might be to use pv and fix up the permissions etc
-  after?
-
-* finish BackendChecksum
diff --git a/debian/docs b/debian/docs
index d6fa57dd7b..1936cc1d44 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-doc/*.mdwn
-TODO
+html
diff --git a/doc/bugs/backendchecksum.mdwn b/doc/bugs/backendchecksum.mdwn
new file mode 100644
index 0000000000..40ff868c22
--- /dev/null
+++ b/doc/bugs/backendchecksum.mdwn
@@ -0,0 +1 @@
+This backend is not finished.
diff --git a/doc/bugs/dotdot_problem.mdwn b/doc/bugs/dotdot_problem.mdwn
new file mode 100644
index 0000000000..9d247a9c09
--- /dev/null
+++ b/doc/bugs/dotdot_problem.mdwn
@@ -0,0 +1,2 @@
+cannot "git annex ../foo"   (GitRepo.relative is buggy and
+git-ls-files also refuses w/o --full-name, which would need other changes)
diff --git a/doc/bugs/file_copy_progress_bar.mdwn b/doc/bugs/file_copy_progress_bar.mdwn
new file mode 100644
index 0000000000..cd4ea33b78
--- /dev/null
+++ b/doc/bugs/file_copy_progress_bar.mdwn
@@ -0,0 +1,3 @@
+Find a way to copy a file with a progress bar, while still preserving
+stat. Easiest way might be to use pv and fix up the permissions etc
+after?
diff --git a/doc/bugs/fsck.mdwn b/doc/bugs/fsck.mdwn
new file mode 100644
index 0000000000..308a1cb63a
--- /dev/null
+++ b/doc/bugs/fsck.mdwn
@@ -0,0 +1 @@
+add a git annex fsck that finds keys that have no referring file
diff --git a/doc/bugs/gitrm.mdwn b/doc/bugs/gitrm.mdwn
new file mode 100644
index 0000000000..d771aa32a7
--- /dev/null
+++ b/doc/bugs/gitrm.mdwn
@@ -0,0 +1,2 @@
+how to handle git rm file? (should try to drop keys that have no
+referring file, if it seems safe..)
diff --git a/doc/bugs/network_remotes.mdwn b/doc/bugs/network_remotes.mdwn
new file mode 100644
index 0000000000..be43ee20be
--- /dev/null
+++ b/doc/bugs/network_remotes.mdwn
@@ -0,0 +1,3 @@
+Support for remote git repositories (ssh:// specifically can be made to
+work, although the other end probably needs to have git-annex
+installed..)
diff --git a/doc/bugs/pushpull.mdwn b/doc/bugs/pushpull.mdwn
new file mode 100644
index 0000000000..47da2107f2
--- /dev/null
+++ b/doc/bugs/pushpull.mdwn
@@ -0,0 +1,2 @@
+--push/--pull should take a reponame and files, and push those files
+  to that repo; dropping them from the current repo