diff --git a/syntax/org.vim b/syntax/org.vim
index be7ddc6..acdcad9 100644
--- a/syntax/org.vim
+++ b/syntax/org.vim
@@ -94,8 +94,10 @@ highlight def link orgTag Type
 
 
 " Timestamps
-syntax match orgTimestamp /<\d\{4}-\d\{2}-\d\{2}.\{-}>/ keepend
-highlight def link orgTimestamp Operator
+syntax match orgTimestampActive /<\d\{4}-\d\{2}-\d\{2}.\{-}>/ keepend
+syntax match orgTimestampInactive /\[\d\{4}-\d\{2}-\d\{2}.\{-}\]/ keepend
+highlight def link orgTimestampActive Operator
+highlight def link orgTimestampInactive Comment
 
 
 " Hyperlinks