diff --git a/yasnippet.el b/yasnippet.el
index 80f71cf..4d0817c 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -882,6 +882,8 @@ Do this unless `yas/dont-activate' is truish "
   (setq font-lock-defaults '(yas/font-lock-keywords))
   (set (make-local-variable 'require-final-newline) nil)
   (use-local-map snippet-mode-map))
+  (set (make-local-variable 'comment-start) "#")
+  (set (make-local-variable 'comment-start-skip) "#+[\t ]*"))