diff --git a/Android.mk b/Android.mk
index d348a5205508d..97f012cf0cf99 100644
--- a/Android.mk
+++ b/Android.mk
@@ -358,6 +358,8 @@ web_docs_sample_code_flags := \
guide/samples/LunarLander "Lunar Lander" \
-samplecode $(sample_dir)/NotePad \
guide/samples/NotePad "Note Pad" \
+ -samplecode $(sample_dir)/SearchableDictionary \
+ guide/samples/SearchableDictionary "Searchable Dictionary" \
-samplecode $(sample_dir)/Snake \
guide/samples/Snake "Snake" \
-samplecode $(sample_dir)/SoftKeyboard \
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 459ad37f79b6b..ef1a1ea51caa3 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -399,6 +399,9 @@
Note Pad
+
+ Searchable Dictionary
+
Snake
diff --git a/docs/html/guide/samples/images/SearchableDictionary1.png b/docs/html/guide/samples/images/SearchableDictionary1.png
new file mode 100644
index 0000000000000..ebb4604f8607e
Binary files /dev/null and b/docs/html/guide/samples/images/SearchableDictionary1.png differ
diff --git a/docs/html/guide/samples/images/SearchableDictionary2.png b/docs/html/guide/samples/images/SearchableDictionary2.png
new file mode 100644
index 0000000000000..34746cd155633
Binary files /dev/null and b/docs/html/guide/samples/images/SearchableDictionary2.png differ
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index d8bbc4128c54d..6e79d5020b019 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -33,6 +33,10 @@ can modify them and watch them execute.
An application for saving notes. Similar (but not identical) to the
Notepad tutorial.
+ Searchable Dictionary
+ A sample application that demonstrates Android's search framework,
+ including how to provide search suggestions for Quick Search Box.
+
Snake
An implementation of the classic game "Snake."