diff --git a/syntax/Makefile.am b/syntax/Makefile.am

index 49ee0a2..368cdf7 100644

--- a/syntax/Makefile.am

+++ b/syntax/Makefile.am

@@ -3,6 +3,7 @@ SYNTAXFILES =			\

 	ada95.syntax		\

 	aspx.syntax		\

 	assembler.syntax	\

+	cxx.syntax		\

 	c.syntax		\

 	changelog.syntax	\

  	debian-changelog.syntax \

diff --git a/syntax/Syntax b/syntax/Syntax

index fa5c24c..57b749e 100644

--- a/syntax/Syntax

+++ b/syntax/Syntax

@@ -77,9 +77,12 @@ include latex.syntax

 file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument

 include texinfo.syntax

-file ..\*\\.([chC]|CC|cxx|cc|cpp|CPP|CXX|hxx|hpp|HPP|h\.in)$ C/C\+\+\sProgram

+file ..\*\\.c$ C\sProgram

 include c.syntax

+file ..\*\\.([hC]|CC|cxx|cc|cpp|CPP|CXX|hxx|h\.in|hh|hpp)$ C/C\+\+\sProgram

+include cxx.syntax

+

 file ..\*\\.d$ D\sProgram

 include d.syntax

diff --git a/syntax/c.syntax b/syntax/c.syntax

index 4c50f1c..91f070c 100644

--- a/syntax/c.syntax

+++ b/syntax/c.syntax

@@ -33,34 +33,7 @@ context default

     keyword whole volatile yellow

     keyword whole while yellow

     keyword whole asm yellow

-    keyword whole catch yellow

-    keyword whole class yellow

-    keyword whole friend yellow

-    keyword whole delete yellow

     keyword whole inline yellow

-    keyword whole new yellow

-    keyword whole operator yellow

-    keyword whole private yellow

-    keyword whole protected yellow

-    keyword whole public yellow

-    keyword whole this yellow

-    keyword whole throw yellow

-    keyword whole template yellow

-    keyword whole try yellow

-    keyword whole virtual yellow

-    keyword whole bool yellow

-    keyword whole const_cast yellow

-    keyword whole dynamic_cast yellow

-    keyword whole explicit yellow

-    keyword whole false yellow

-    keyword whole mutable yellow

-    keyword whole namespace yellow

-    keyword whole reinterpret_cast yellow

-    keyword whole static_cast yellow

-    keyword whole true yellow

-    keyword whole typeid yellow

-    keyword whole typename yellow

-    keyword whole using yellow

     keyword whole wchar_t yellow

     keyword whole ... yellow

     keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta