diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
index a2d7d90c1..6e7783b30 100644
--- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
+++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Pivotal, Inc.
+ * Copyright (c) 2017, 2018 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,13 +11,11 @@
 package org.springframework.ide.vscode.commons.yaml.schema.constraints;
 
 import static org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems.EXTRA_PROPERTY;
-import static org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems.*;
+import static org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems.missingProperty;
 import static org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems.problem;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
@@ -37,12 +35,11 @@ import org.springframework.ide.vscode.commons.yaml.schema.YType;
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.NodeTuple;
+import org.yaml.snakeyaml.nodes.ScalarNode;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
-import com.google.common.collect.MultimapBuilder;
-import com.google.common.collect.Multiset;
 
 /**
  * Various static methods for constructing/composing {@link Constraint}s.
@@ -130,6 +127,16 @@ public class Constraints {
 		};
 	}
 
+	public static Constraint deprecatedScalar(Function<String, String> messageFormatter) {
+		return (DynamicSchemaContext dc, Node parent, Node node, YType type, IProblemCollector problems) -> {
+			if (node instanceof ScalarNode) {
+				ScalarNode scalarNode = (ScalarNode) node;
+				String name = NodeUtil.asScalar(scalarNode);
+				problems.accept(YamlSchemaProblems.deprecatedProperty(messageFormatter.apply(name), node));
+			}
+		};
+	}
+
 	/**
 	 * Deprecated because you shouldn't need to use this method to create a {@link SchemaContextAware} Constraint.
 	 * A Constraint itself is already implicitly aware of the {@link DynamicSchemaContext} (i.e. it already receives
diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
index 7f43470e1..a64b49937 100644
--- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
+++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016, 2017 Pivotal, Inc.
+ * Copyright (c) 2016, 2018 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YTypedPro
 import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
 import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
 import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
+import org.springframework.ide.vscode.commons.yaml.schema.constraints.Constraints;
 import org.yaml.snakeyaml.nodes.Node;
 
 import com.google.common.collect.ImmutableList;
@@ -120,10 +121,18 @@ public final class ManifestYmlSchema implements YamlSchema {
 
 		YAtomicType t_path = f.yatomic("Path");
 
-		YAtomicType t_buildpack = f.yatomic("Buildpack");
+		YAtomicType t_buildpack_entry = f.yatomic("Buildpack Entry");
 		if (buildpackProvider != null) {
+			t_buildpack_entry.setHintProvider(buildpackProvider);
+//			t_buildpack_entry.parseWith(ManifestYmlValueParsers.fromHints(t_buildpack_entry.toString(), buildpackProvider));
+		}
+
+		// Deprecated. See: https://www.pivotaltracker.com/story/show/162499688
+		YAtomicType t_buildpack = f.yatomic("Buildpack");
+		if (t_buildpack != null) {
 			t_buildpack.setHintProvider(buildpackProvider);
-//			t_buildpack.parseWith(ManifestYmlValueParsers.fromHints(t_buildpack.toString(), buildpackProvider));
+			t_buildpack.require(Constraints.deprecatedScalar((name) ->
+								"Deprecated: Use `buildpacks` instead."));
 		}
 
 		YAtomicType t_stack = f.yatomic("Stack");
@@ -189,6 +198,7 @@ public final class ManifestYmlSchema implements YamlSchema {
 
 		YTypedPropertyImpl[] props = {
 			f.yprop("buildpack", t_buildpack),
+			f.yprop("buildpacks", f.yseq(t_buildpack_entry)),
 			f.yprop("command", t_string),
 			f.yprop("disk_quota", t_memory),
 			f.yprop("domain", t_domain),