diff --git a/lib/hamlit/compiler.rb b/lib/hamlit/compiler.rb
index 7b624597..faaec4fd 100644
--- a/lib/hamlit/compiler.rb
+++ b/lib/hamlit/compiler.rb
@@ -1,4 +1,5 @@
 require 'hamlit/compilers/attributes'
+require 'hamlit/compilers/comment'
 require 'hamlit/compilers/doctype'
 require 'hamlit/compilers/dynamic'
 require 'hamlit/compilers/filter'
@@ -11,6 +12,7 @@ require 'temple/html/filter'
 module Hamlit
   class Compiler < Temple::HTML::Filter
     include Compilers::Attributes
+    include Compilers::Comment
     include Compilers::Doctype
     include Compilers::Dynamic
     include Compilers::Filter
diff --git a/lib/hamlit/compilers/comment.rb b/lib/hamlit/compilers/comment.rb
new file mode 100644
index 00000000..a16f1b34
--- /dev/null
+++ b/lib/hamlit/compilers/comment.rb
@@ -0,0 +1,13 @@
+module Hamlit
+  module Compilers
+    module Comment
+      def on_haml_comment(condition, exps)
+        content = [:multi]
+        content << [:static, "#{condition}>\n"]
+        content += exps.map { |exp| compile(exp) }
+        content << [:static, "<![endif]"]
+        [:html, :comment, content]
+      end
+    end
+  end
+end
diff --git a/lib/hamlit/parser.rb b/lib/hamlit/parser.rb
index 7a2cbe40..d570792b 100644
--- a/lib/hamlit/parser.rb
+++ b/lib/hamlit/parser.rb
@@ -202,16 +202,17 @@ module Hamlit
       raise SyntaxError unless scanner.scan(/\//)
 
       ast = [:html, :comment]
-      if scanner.rest.match(/[^ ]/)
-        ast << [:static, " #{scanner.scan(/.+/).strip} "]
-        return ast
+      text = (scanner.scan(/.+/) || '').strip
+
+      if text.empty?
+        content = with_indented { parse_lines }
+        return ast << [:multi, [:static, "\n"], *content]
+      elsif !text.match(/\[.*\]/)
+        return ast << [:static, " #{text} "]
       end
 
-      # FIXME: parse_lines may not be enough
-      content = [:multi, [:static, "\n"]]
-      content += with_indented { parse_lines }
-      ast << content
-      ast
+      content = with_indented { parse_lines }
+      [:haml, :comment, text, content]
     end
 
     def parse_filter(scanner)
diff --git a/spec/haml_spec.rb b/spec/haml_spec.rb
index 7d22b02f..79b9918b 100644
--- a/spec/haml_spec.rb
+++ b/spec/haml_spec.rb
@@ -659,8 +659,7 @@ describe "haml" do
   end
 
   context "conditional comments" do
-    # FIXME: I'll implement later
-    pending "a conditional comment" do
+    specify "a conditional comment" do
       haml    = %q{/[if IE]
   %p a}
       html    = %q{<!--[if IE]>