diff --git a/hamlpy/nodes.py b/hamlpy/nodes.py
index a5e7e4a..2e849e0 100644
--- a/hamlpy/nodes.py
+++ b/hamlpy/nodes.py
@@ -440,6 +440,8 @@ class TagNode(HamlNode):
                     'comment': 'endcomment',
                     'cache': 'endcache',
                     'localize': 'endlocalize',
+                    'call': 'endcall',
+                    'macro': 'endmacro',
                     'compress': 'endcompress'}
     may_contain = {'if':['else', 'elif'],
                    'ifchanged':'else',