diff --git a/Android.mk b/Android.mk
index 07380bc..4c0c43a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -435,7 +435,9 @@
 		-samplecode $(sample_dir)/NotePad \
 		            resources/samples/NotePad "Note Pad" \
 		-samplecode $(sample_dir)/SpellChecker/SampleSpellCheckerService \
-		            resources/samples/SpellChecker/SampleSpellCheckerService "Spell Checker" \
+		            resources/samples/SpellChecker/SampleSpellCheckerService "Spell Checker service" \
+		-samplecode $(sample_dir)/SpellChecker/HelloSpellChecker \
+		            resources/samples/SpellChecker/HelloSpellCheckerService "Spell Checker client" \
 		-samplecode $(sample_dir)/SampleSyncAdapter \
 		            resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
 		-samplecode $(sample_dir)/RandomMusicPlayer \
diff --git a/core/java/android/service/textservice/package.html b/core/java/android/service/textservice/package.html
index b498719..0b5113b 100644
--- a/core/java/android/service/textservice/package.html
+++ b/core/java/android/service/textservice/package.html
@@ -31,8 +31,10 @@
 &lt;/service>
 </pre>
 
-<p>For example code, see the <a
+<p>For example code, see the sample <a
 href="{@docRoot}resources/samples/SpellChecker/SampleSpellCheckerService/index.html">Spell
-Checker</a> sample app.</p>
+Checker service</a> app, and the sample <a
+href="{@docRoot}resources/samples/SpellChecker/HelloSpellChecker/index.html">Spell
+Checker client</a> app.</p>
 </BODY>
 </HTML>
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 38357ef..164bd16 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -601,10 +601,20 @@
     tags: ['sample', 'input', 'new'],
     path: 'samples/SpellChecker/SampleSpellCheckerService/index.html',
     title: {
-      en: 'Spell Checker'
+      en: 'Spell Checker Service'
     },
     description: {
-      en: 'An example spell checker service, using the <a href="'+toRoot+'reference/android/service/textservice/SpellCheckerService.html"><code>SpellCheckerservice</code></a>.'
+      en: 'An example spell checker service, using the <a href="'+toRoot+'reference/android/service/textservice/SpellCheckerService.html"><code>SpellCheckerService</code></a>.'
+    }
+  },
+  {
+    tags: ['sample', 'input', 'new'],
+    path: 'samples/SpellChecker/HelloSpellChecker/index.html',
+    title: {
+      en: 'Spell Checker Client'
+    },
+    description: {
+        en: 'An example spell checker client, using the <a href="'+toRoot+'reference/android/view/textservice/TextServicesManager.html"><code>TextServicesManager</code></a> and <a href="'+toRoot+'reference/android/view/textservice/SpellCheckerSession.html"><code>SpellCheckerSession</code></a>.'
     }
   },
   {
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd
index b6381fc..0708dd3 100644
--- a/docs/html/sdk/android-4.0.jd
+++ b/docs/html/sdk/android-4.0.jd
@@ -957,8 +957,10 @@
 include a {@code &lt;meta-data&gt;} element that declares configuration information for the spell
 checker. </p>
 
-<p>See the <a href="{@docRoot}resources/samples/SpellChecker/SampleSpellCheckerService/index.html">
-Spell Checker</a> sample app for example code.</p>
+<p>See the sample <a href="{@docRoot}resources/samples/SpellChecker/SampleSpellCheckerService/index.html">
+Spell Checker Service</a> app and
+sample <a href="{@docRoot}resources/samples/SpellChecker/HelloSpellChecker/index.html">
+Spell Checker Client</a> app for example code.</p>