diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index efcadf4836cb..8d8d8f9370e2 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	bicom
 PORTVERSION=	1.01
 CATEGORIES=	archivers
-MASTER_SITES=	http://www3.sympatico.ca/mt0000/bicom/ \
-		http://freebsd.nsu.ru/distfiles/
+MASTER_SITES=	http://www.mirrorservice.org/pub/minix/distfiles/backup/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data compressor in the PPM family
 WWW=		http://www3.sympatico.ca/mt0000/bicom/
 
 # Converted from RESTRICTED
 LICENSE=	BICOM
 LICENSE_NAME=	bicom
 LICENSE_TEXT=	Contact author personally regarding commercial use
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-USES=		zip
+USES=		dos2unix zip
+DOS2UNIX_GLOB=	*.cpp *.h
 NO_WRKSUBDIR=	yes
 MAKEFILE=	${FILESDIR}/Makefile
 
 PLIST_FILES=	bin/bicom
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${STAGEDIR}/${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/archivers/bicom/files/patch-bialib_sufftree.h b/archivers/bicom/files/patch-bialib_sufftree.h
index 2782c4887989..f3eb9d59883a 100644
--- a/archivers/bicom/files/patch-bialib_sufftree.h
+++ b/archivers/bicom/files/patch-bialib_sufftree.h
@@ -1,11 +1,11 @@
---- bialib/sufftree.h.orig	2000-10-26 01:51:04 UTC
-+++ bialib/sufftree.h
-@@ -95,7 +95,7 @@ class SuffixTreeModel : public Arithmeti
-     {
-     public:
-     bool InEdge()
--      {return(r>0);}
-+      {return(r!=NULL);}
-     //After Canonize()ing a point, r >0 <=> proj!=0, i.e., point
-     //is inside an edge
-     INode *ins;  //parent of point
+--- bialib/sufftree.h.orig	2000-10-26 01:51:04 UTC
++++ bialib/sufftree.h
+@@ -95,7 +95,7 @@ class SuffixTreeModel : public Arithmeti
+     {
+     public:
+     bool InEdge()
+-      {return(r>0);}
++      {return(r!=NULL);}
+     //After Canonize()ing a point, r >0 <=> proj!=0, i.e., point
+     //is inside an edge
+     INode *ins;  //parent of point