--- a/nsis-mode.el	Tue Dec 20 21:12:34 2011 +0200
+++ b/nsis-mode.el	Tue Dec 20 21:45:23 2011 +0200
@@ -23,8 +23,12 @@
   )
 
 (defun nsis-mode-set-comment-style ()
-  (setq comment-start "; ")
-  (setq comment-end "")
+  (set (make-local-variable 'comment-start) "; ")
+  (set (make-local-variable 'comment-continue) nil)
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-end-skip) nil)
+  (set (make-local-variable 'comment-multi-line) nil)
+  (set (make-local-variable 'comment-use-syntax) t)
   )
 
 ;;;###autoload