diff --git a/dpaste/highlight.py b/dpaste/highlight.py
index 750f978..7e5f806 100644
--- a/dpaste/highlight.py
+++ b/dpaste/highlight.py
@@ -38,6 +38,7 @@ LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
         ('bash', 'Bash'),
         ('bbcode', 'BBCode'),
         ('c', 'C'),
+        ('cpp', 'C++'),
         ('clojure', 'Clojure'),
         ('cobol', 'COBOL'),
         ('css', 'CSS'),