diff --git a/doc/cheatsheet.mdwn b/doc/cheatsheet.mdwn
deleted file mode 100644
index 65cbad187c..0000000000
--- a/doc/cheatsheet.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-A supplement to the [[walkthrough]].
-
-[[!toc]]
-
-[[!inline feeds=no show=0 template=walkthrough pagenames="""
-	walkthrough/using_Amazon_S3
-	walkthrough/using_bup
-	walkthrough/using_the_web
-	walkthrough/using_the_SHA1_backend
-	walkthrough/migrating_data_to_a_new_backend
-	walkthrough/untrusted_repositories
-	walkthrough/what_to_do_when_you_lose_a_repository
-	walkthrough/recover_data_from_lost+found
-	walkthrough/Internet_Archive_via_S3
-	walkthrough/powerful_file_matching
-"""]]
diff --git a/doc/tips.mdwn b/doc/tips.mdwn
new file mode 100644
index 0000000000..eda84c8672
--- /dev/null
+++ b/doc/tips.mdwn
@@ -0,0 +1,4 @@
+This page is a place to document tips and techniques for using git-annex.
+
+[[!inline pages="tips/* and !tips/*/*" archive="yes"
+rootpage="tips" postformtext="Add a new tip about:" show=0]]
diff --git a/doc/walkthrough/Internet_Archive_via_S3.mdwn b/doc/tips/Internet_Archive_via_S3.mdwn
similarity index 100%
rename from doc/walkthrough/Internet_Archive_via_S3.mdwn
rename to doc/tips/Internet_Archive_via_S3.mdwn
diff --git a/doc/walkthrough/migrating_data_to_a_new_backend.mdwn b/doc/tips/migrating_data_to_a_new_backend.mdwn
similarity index 100%
rename from doc/walkthrough/migrating_data_to_a_new_backend.mdwn
rename to doc/tips/migrating_data_to_a_new_backend.mdwn
diff --git a/doc/walkthrough/powerful_file_matching.mdwn b/doc/tips/powerful_file_matching.mdwn
similarity index 100%
rename from doc/walkthrough/powerful_file_matching.mdwn
rename to doc/tips/powerful_file_matching.mdwn
diff --git a/doc/walkthrough/recover_data_from_lost+found.mdwn b/doc/tips/recover_data_from_lost+found.mdwn
similarity index 100%
rename from doc/walkthrough/recover_data_from_lost+found.mdwn
rename to doc/tips/recover_data_from_lost+found.mdwn
diff --git a/doc/walkthrough/untrusted_repositories.mdwn b/doc/tips/untrusted_repositories.mdwn
similarity index 100%
rename from doc/walkthrough/untrusted_repositories.mdwn
rename to doc/tips/untrusted_repositories.mdwn
diff --git a/doc/walkthrough/using_Amazon_S3.mdwn b/doc/tips/using_Amazon_S3.mdwn
similarity index 100%
rename from doc/walkthrough/using_Amazon_S3.mdwn
rename to doc/tips/using_Amazon_S3.mdwn
diff --git a/doc/walkthrough/using_the_SHA1_backend.mdwn b/doc/tips/using_the_SHA1_backend.mdwn
similarity index 100%
rename from doc/walkthrough/using_the_SHA1_backend.mdwn
rename to doc/tips/using_the_SHA1_backend.mdwn
diff --git a/doc/walkthrough/using_the_web.mdwn b/doc/tips/using_the_web.mdwn
similarity index 100%
rename from doc/walkthrough/using_the_web.mdwn
rename to doc/tips/using_the_web.mdwn
diff --git a/doc/walkthrough/what_to_do_when_you_lose_a_repository.mdwn b/doc/tips/what_to_do_when_you_lose_a_repository.mdwn
similarity index 100%
rename from doc/walkthrough/what_to_do_when_you_lose_a_repository.mdwn
rename to doc/tips/what_to_do_when_you_lose_a_repository.mdwn
diff --git a/doc/walkthrough/more.mdwn b/doc/walkthrough/more.mdwn
index 1eaf9009f6..0a4a5b94e8 100644
--- a/doc/walkthrough/more.mdwn
+++ b/doc/walkthrough/more.mdwn
@@ -1,4 +1,3 @@
 So ends the walkthrough. By now you should be able to use git-annex.
 
-Want more? See the [[cheatsheet]] for info about all of git-annex's hidden
-features.
+Want more? See [[tips]] for lots more features and advice.