diff --git a/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/alias.md b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/alias.md
new file mode 100644
index 000000000..e8f170fab
--- /dev/null
+++ b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/alias.md
@@ -0,0 +1 @@
+*Required*. Name of a stemcell used in the deployment.
\ No newline at end of file
diff --git a/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/name.md b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/name.md
new file mode 100644
index 000000000..710f2ac3d
--- /dev/null
+++ b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/name.md
@@ -0,0 +1 @@
+Full name of a matching stemcell. Either `name` or `os` keys can be specified.
\ No newline at end of file
diff --git a/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/os.md b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/os.md
new file mode 100644
index 000000000..6e3ae6d80
--- /dev/null
+++ b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/os.md
@@ -0,0 +1 @@
+Operating system of a matching stemcell. Example: `ubuntu-trusty`. Either `name` or `os` keys can be specified.
\ No newline at end of file
diff --git a/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/version.md b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/version.md
new file mode 100644
index 000000000..5d67c6c21
--- /dev/null
+++ b/headless-services/bosh-language-server/src/main/resources/desc/Stemcell/version.md
@@ -0,0 +1 @@
+*Required*. The version of a matching stemcell. Version can be `latest`.
\ No newline at end of file
diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
index 071b916d4..3acb9bba7 100644
--- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
+++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
@@ -213,6 +213,22 @@ public class BoshEditorTest {
 		);
 	}
 
+	@Test public void stemcellHovers() throws Exception {
+		Editor editor = harness.newEditor(
+				"stemcells:\n" +
+				"- alias: default\n" +
+				"  os: ubuntu-trusty\n" +
+				"  version: 3147\n" +
+				"  name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent"
+		);
+		editor.assertHoverContains("alias", "Name of a stemcell used in the deployment");
+		editor.assertHoverContains("os", "Operating system of a matching stemcell");
+		editor.assertHoverContains("version", "The version of a matching stemcell");
+		editor.assertHoverContains("name", "Full name of a matching stemcell. Either `name` or `os` keys can be specified.");
+	}
+
+
+
 	@Test public void releasesBlockCompletions() throws Exception {
 		Editor editor = harness.newEditor(
 				"releases:\n" +