diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
index 5013166..90972eb 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
@@ -98,6 +98,8 @@
 		// Blocktags here.
 		addHTMLishTag(parser, "script"); //$NON-NLS-1$
 		addHTMLishTag(parser, "style"); //$NON-NLS-1$
+		addHTMLishTag(parser, "textarea"); //$NON-NLS-1$
+		addHTMLishTag(parser, "option"); //$NON-NLS-1$
 		return parser;
 	}
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
index b034d24..1a9a226 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2016 IBM Corporation and others.
  * 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
@@ -73,8 +73,11 @@
 	 */
 	public void initializeParser(RegionParser parser) {
 		if (parser instanceof BlockTagParser) {
-			addHTMLishTag((BlockTagParser) parser, "script"); //$NON-NLS-1$
-			addHTMLishTag((BlockTagParser) parser, "style"); //$NON-NLS-1$
+			BlockTagParser blockTagParser = (BlockTagParser) parser;
+			addHTMLishTag(blockTagParser, "script"); //$NON-NLS-1$
+			addHTMLishTag(blockTagParser, "style"); //$NON-NLS-1$
+			addHTMLishTag(blockTagParser, "textarea"); //$NON-NLS-1$
+			addHTMLishTag(blockTagParser, "option"); //$NON-NLS-1$
 		}
 	}