diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile
index 7b80c34ab69e..7fe4c037ac6e 100644
--- a/audio/taglookup/Makefile
+++ b/audio/taglookup/Makefile
@@ -10,6 +10,9 @@ MASTER_SITES=	http://www.kamaz.org.uk/taglookup/
 MAINTAINER=	alex@kamaz.org.uk
 COMMENT=	Utility for tagging groups of audio files using CDDB
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libcddb.so:audio/libcddb \
 		libtag.so:audio/taglib
 
diff --git a/audio/taglookup/files/patch-tag.cpp b/audio/taglookup/files/patch-tag.cpp
index 9ed9dcbe12fe..136b6a4fb206 100644
--- a/audio/taglookup/files/patch-tag.cpp
+++ b/audio/taglookup/files/patch-tag.cpp
@@ -31,3 +31,20 @@
                  return true;
              else
                  return false;
+@@ -261,8 +262,14 @@ namespace TagLookup
+         
+         void operator() (const OldNameNewName &onnn)
+         {
+-            std::string new_base(basename(onnn.new_name.c_str()));
+-            std::string new_path(dirname(onnn.old_name.c_str()));
++            std::vector<char> newbuf(onnn.new_name.begin(), onnn.new_name.end());
++            newbuf.push_back('\0');
++
++            std::vector<char> oldbuf(onnn.old_name.begin(), onnn.old_name.end());
++            oldbuf.push_back('\0');
++
++            std::string new_base(basename(newbuf.data()));
++            std::string new_path(dirname(oldbuf.data()));
+             
+             new_path.append("/");
+             new_path.append(new_base);