--- lexer.l.orig	2002-10-23 07:50:31.000000000 -0700
+++ lexer.l	2002-10-23 07:58:29.000000000 -0700
@@ -124,7 +124,7 @@
 
 %option align nounput noyywrap noreject 8bit
 
-BASE64		^([A-Za-z0-9/+]+=|[A-Za-z0-9/+]{32,})$
+BASE64		^([A-Za-z0-9/+]+={1,2}|[A-Za-z0-9/+]{32,})\r?$
 UINT8		([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))
 IPADDR		{UINT8}\.{UINT8}\.{UINT8}\.{UINT8}
 MIME_BOUNDARY	^--[^[:blank:][:cntrl:]]+

