diff --git a/Text/ProtocolBuffers/ProtoCompile/Lexer.x b/Text/ProtocolBuffers/ProtoCompile/Lexer.x
--- a/Text/ProtocolBuffers/ProtoCompile/Lexer.x
+++ b/Text/ProtocolBuffers/ProtoCompile/Lexer.x
@@ -14,7 +14,7 @@
 
 %wrapper "posn-bytestring"
 
-@inComment = ([^\*] | $white)+ | ([\*]+ [^\/])
+@inComment = ( [^\*] | $white | ([\*]+ ([^\*\/] | $white )))
 @comment = [\/] [\*] (@inComment)* [\*]+ [\/] | "//".* | "#".*
 
 $d = [0-9]
@@ -127,7 +127,7 @@
 -- values in the range [0..255] and to be c-escaped (in order to
 -- render binary information printable).  This decodes the c-escaping
 -- and returns the binary data as Word8.
--- 
+--
 -- A decoding error causes (Left msg) to be returned.
 sDecode :: [Char] -> Either String [Word8]
 sDecode = op one where
@@ -152,7 +152,7 @@
         Nothing -> Left $ "failed to decode hex sequence "++ys
     where hex = takeWhile isHexDigit (take 2 ys)
           len = length hex
-          rest = drop len ys          
+          rest = drop len ys
   unescape ('u':ys) | ok =
       case mayRead readHex hex of
         Just w -> do w' <- checkUnicode w
diff --git a/hprotoc.cabal b/hprotoc.cabal
--- a/hprotoc.cabal
+++ b/hprotoc.cabal
@@ -1,5 +1,5 @@
 name:           hprotoc
-version:        2.1.5
+version:        2.1.6
 cabal-version:  >= 1.6
 build-type:     Simple
 license:        BSD3
@@ -20,8 +20,8 @@
   location: git://github.com/k-bx/protocol-buffers.git
 
 Executable hprotoc
-  build-depends:   protocol-buffers == 2.1.5,
-                   protocol-buffers-descriptor == 2.1.5
+  build-depends:   protocol-buffers == 2.1.6,
+                   protocol-buffers-descriptor == 2.1.6
   Main-Is:         Text/ProtocolBuffers/ProtoCompile.hs
   Hs-Source-Dirs:  .,
                    protoc-gen-haskell
@@ -69,8 +69,8 @@
                    TypeSynonymInstances
 
 Library
-  build-depends:   protocol-buffers == 2.1.5,
-                   protocol-buffers-descriptor == 2.1.5
+  build-depends:   protocol-buffers == 2.1.6,
+                   protocol-buffers-descriptor == 2.1.6
   Hs-Source-Dirs:  .,
                    protoc-gen-haskell
   build-tools:     alex