diff --git a/Android.mk b/Android.mk
index a83d497cab130..cd4e58ebe1481 100644
--- a/Android.mk
+++ b/Android.mk
@@ -357,6 +357,8 @@ web_docs_sample_code_flags := \
 		-hdf android.hasSamples 1 \
 		-samplecode $(sample_dir)/ApiDemos \
 		            guide/samples/ApiDemos "API Demos" \
+    -samplecode $(sample_dir)/BluetoothChat \
+                guide/samples/BluetoothChat "Bluetooth Chat" \
 		-samplecode $(sample_dir)/Home \
 		            guide/samples/Home "Home" \
 		-samplecode $(sample_dir)/JetBoy \
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 5fbfd4e6e0efc..c28cde106834a 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -396,6 +396,9 @@
           <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">
                 <span class="en">API Demos</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html">
+                <span class="en">Bluetooth Chat</span>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html">
                 <span class="en">Home</span>
               </a></li>
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index 06aa83ce69417..4fca8dac84c31 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -33,6 +33,9 @@ platforms) and allow you to view the source files in your browser. </p>
  <dt><a href="ApiDemos/index.html">API Demos</a></dt>
   <dd>A variety of small applications that demonstrate an extensive collection of
   framework topics.</dd>
+
+ <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt>
+  <dd>An application for two-way text messaging over Bluetooth.</dd>
   
  <dt><a href="Home/index.html">Home</a></dt>
   <dd>An application for saving notes. Similar (but not identical) to the