diff --git a/skin/plantuml.skin b/skin/plantuml.skin
index a99142a1a..e4ba76e7c 100644
--- a/skin/plantuml.skin
+++ b/skin/plantuml.skin
@@ -213,6 +213,12 @@ spot {
   spotException {
 	BackgroundColor #D94321
   }
+  spotMetaClass {
+    BackgroundColor #CCCCCC
+  }
+  spotStereotype {
+    BackgroundColor #FF77FF
+  }
 }
 
 
@@ -573,6 +579,12 @@ spot {
   spotException {
 	BackgroundColor #7D0000
   }
+  spotMetaClass {
+    BackgroundColor #7C7C7C
+  }
+  spotStereotype {
+    BackgroundColor #890089
+  }
 }
 
 
diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java
index 13010c4e0..cb6908833 100644
--- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java
+++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java
@@ -80,7 +80,7 @@ public class CommandCreateClass extends SingleLineCommand2<ClassDiagram> {
 	private static IRegex getRegexConcat() {
 		return RegexConcat.build(CommandCreateClass.class.getName(), RegexLeaf.start(), //
 				new RegexLeaf("TYPE", //
-						"(interface|enum|annotation|abstract[%s]+class|static[%s]+class|abstract|class|entity|circle|diamond|protocol|struct|exception)"), //
+						"(interface|enum|annotation|abstract[%s]+class|static[%s]+class|abstract|class|entity|circle|diamond|protocol|struct|exception|metaclass|stereotype)"), //
 				RegexLeaf.spaceOneOrMore(), //
 				new RegexOr(//
 						new RegexConcat(//
diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java
index 547d408fc..0bd8c2407 100644
--- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java
+++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java
@@ -95,7 +95,7 @@ public class CommandCreateClassMultilines extends CommandMultilines2<ClassDiagra
 		return RegexConcat.build(CommandCreateClassMultilines.class.getName(), RegexLeaf.start(), //
 				new RegexLeaf("VISIBILITY", "(" + VisibilityModifier.regexForVisibilityCharacterInClassName() + ")?"), //
 				new RegexLeaf("TYPE",
-						"(interface|enum|annotation|abstract[%s]+class|static[%s]+class|abstract|class|entity|protocol|struct|exception)"), //
+						"(interface|enum|annotation|abstract[%s]+class|static[%s]+class|abstract|class|entity|protocol|struct|exception|metaclass|stereotype)"), //
 				RegexLeaf.spaceOneOrMore(), //
 				new RegexOr(//
 						new RegexConcat(//
diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java
index 37aa37f98..9ba7319f5 100644
--- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java
+++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowByGender.java
@@ -137,6 +137,10 @@ public class CommandHideShowByGender extends SingleLineCommand2<UmlDiagram> {
 			gender = EntityGenderUtils.byEntityType(LeafType.STRUCT);
 		} else if (arg1.equalsIgnoreCase("exception")) {
 			gender = EntityGenderUtils.byEntityType(LeafType.EXCEPTION);
+		} else if (arg1.equalsIgnoreCase("metaclass")) {
+			gender = EntityGenderUtils.byEntityType(LeafType.METACLASS);
+		} else if (arg1.equalsIgnoreCase("stereotype")) {
+			gender = EntityGenderUtils.byEntityType(LeafType.STEREOTYPE);
 		} else if (arg1.startsWith("<<")) {
 			gender = EntityGenderUtils.byStereotype(arg1);
 		} else {
@@ -175,6 +179,10 @@ public class CommandHideShowByGender extends SingleLineCommand2<UmlDiagram> {
 			gender = EntityGenderUtils.byEntityType(LeafType.STRUCT);
 		} else if (arg1.equalsIgnoreCase("exception")) {
 			gender = EntityGenderUtils.byEntityType(LeafType.EXCEPTION);
+		} else if (arg1.equalsIgnoreCase("metaclass")) {
+			gender = EntityGenderUtils.byEntityType(LeafType.METACLASS);
+		} else if (arg1.equalsIgnoreCase("stereotype")) {
+			gender = EntityGenderUtils.byEntityType(LeafType.STEREOTYPE);
 		} else if (arg1.startsWith("<<")) {
 			gender = EntityGenderUtils.byStereotype(arg1);
 		} else {
diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java
index 082725f3c..f0f88ea31 100644
--- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java
+++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java
@@ -97,7 +97,7 @@ final public class CommandLinkLollipop extends SingleLineCommand2<AbstractClassO
 
 	private static String optionalKeywords(UmlDiagramType type) {
 		if (type == UmlDiagramType.CLASS)
-			return "(interface|enum|annotation|abstract[%s]+class|abstract|class|entity|protocol|struct|exception)";
+			return "(interface|enum|annotation|abstract[%s]+class|abstract|class|entity|protocol|struct|exception|metaclass|stereotype)";
 
 		if (type == UmlDiagramType.OBJECT)
 			return "(object)";
diff --git a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java
index f90132164..e06986b6e 100644
--- a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java
+++ b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java
@@ -32,6 +32,7 @@
  * Original Author:  Arnaud Roques
  * Contribution :  Hisashi Miyashita
  * Contribution :  Serge Wenger
+ * Contribution :  The-Lum
  *
  */
 package net.sourceforge.plantuml.cucadiagram;
@@ -42,7 +43,7 @@ public enum LeafType {
 
 	EMPTY_PACKAGE,
 
-	ABSTRACT_CLASS, CLASS, INTERFACE, ANNOTATION, PROTOCOL, STRUCT, EXCEPTION, LOLLIPOP_FULL, LOLLIPOP_HALF, NOTE, TIPS,
+	ABSTRACT_CLASS, CLASS, INTERFACE, ANNOTATION, PROTOCOL, STRUCT, EXCEPTION, METACLASS, STEREOTYPE, LOLLIPOP_FULL, LOLLIPOP_HALF, NOTE, TIPS,
 	OBJECT, MAP, JSON, ASSOCIATION, ENUM, CIRCLE,
 
 	USECASE, USECASE_BUSINESS,
@@ -80,7 +81,8 @@ public enum LeafType {
 	public boolean isLikeClass() {
 		return this == LeafType.ANNOTATION || this == LeafType.ABSTRACT_CLASS || this == LeafType.CLASS
 				|| this == LeafType.INTERFACE || this == LeafType.ENUM || this == LeafType.ENTITY
-				|| this == LeafType.PROTOCOL || this == LeafType.STRUCT || this == LeafType.EXCEPTION;
+				|| this == LeafType.PROTOCOL || this == LeafType.STRUCT || this == LeafType.EXCEPTION
+				|| this == LeafType.METACLASS || this == LeafType.STEREOTYPE;
 	}
 
 	public String toHtml() {
diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java
index d33813043..576071874 100644
--- a/src/net/sourceforge/plantuml/style/SName.java
+++ b/src/net/sourceforge/plantuml/style/SName.java
@@ -151,6 +151,8 @@ public enum SName {
 	spotException, //
 	spotClass, //
 	spotAbstractClass, //
+	spotMetaClass, //
+	spotStereotype, //
 
 	wbsDiagram, //
 	yamlDiagram; //
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
index fb2415c4d..43e2e759d 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
@@ -199,6 +199,10 @@ public class EntityImageClassHeader extends AbstractEntityImage {
 			return StyleSignatureBasic.of(SName.root, SName.element, SName.spot, SName.spotStruct);
 		case EXCEPTION:
 			return StyleSignatureBasic.of(SName.root, SName.element, SName.spot, SName.spotException);
+		case METACLASS:
+			return StyleSignatureBasic.of(SName.root, SName.element, SName.spot, SName.spotMetaClass);
+		case STEREOTYPE:
+			return StyleSignatureBasic.of(SName.root, SName.element, SName.spot, SName.spotStereotype);
 		}
 		throw new IllegalStateException();
 	}
@@ -223,6 +227,10 @@ public class EntityImageClassHeader extends AbstractEntityImage {
 			return 'S';
 		case EXCEPTION:
 			return 'X';
+		case METACLASS:
+			return 'M';
+		case STEREOTYPE:
+			return 'S';
 		}
 		assert false;
 		return '?';