diff -urN id3lib/Makefile id3lib.new/Makefile
--- id3lib/Makefile	Mon May 29 01:40:14 2006
+++ id3lib.new/Makefile	Mon May 29 01:40:35 2006
@@ -7,12 +7,12 @@
 
 PORTNAME=	id3lib
 PORTVERSION=	3.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
 USE_ICONV=	yes
diff -urN id3lib/files/patch-io_helpers.cpp id3lib.new/files/patch-io_helpers.cpp
--- id3lib/files/patch-io_helpers.cpp	Thu Jan  1 07:00:00 1970
+++ id3lib.new/files/patch-io_helpers.cpp	Mon May 29 01:40:14 2006
@@ -0,0 +1,14 @@
+--- src/io_helpers.cpp.orig	Sun Mar  2 07:23:00 2003
++++ src/io_helpers.cpp	Mon May 29 01:23:33 2006
+@@ -363,9 +363,10 @@
+     // Write the BOM: 0xFEFF
+     unicode_t BOM = 0xFEFF;
+     writer.writeChars((const unsigned char*) &BOM, 2);
++    const unsigned char* pdata = (const unsigned char*)data.c_str();
+     for (size_t i = 0; i < size; i += 2)
+     {
+-      unicode_t ch = (data[i] << 8) | data[i+1];
++      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+       writer.writeChars((const unsigned char*) &ch, 2);
+     }
+   }