diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile
index 7f4ae07fbda1..59f9531211ff 100644
--- a/audio/taglookup/Makefile
+++ b/audio/taglookup/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
 		libtag.so:${PORTSDIR}/audio/taglib
 
 USES=		pkgconfig
-NO_STAGE=	yes
 
-MAN1=		taglookup.1
-PLIST_FILES=	bin/taglookup
+PLIST_FILES=	bin/taglookup \
+		man/man1/taglookup.1.gz
 
 .include <bsd.port.mk>
diff --git a/audio/taglookup/files/patch-Makefile b/audio/taglookup/files/patch-Makefile
index 9f154f0aaaed..ddf6cc62aa28 100644
--- a/audio/taglookup/files/patch-Makefile
+++ b/audio/taglookup/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2007-10-29 08:02:54.000000000 -0400
-+++ ./Makefile	2011-03-18 18:59:23.000000000 -0400
+--- ./Makefile.orig	2007-10-29 13:02:54.000000000 +0100
++++ ./Makefile	2014-04-07 10:15:45.329720325 +0200
 @@ -4,7 +4,7 @@
  TAGLIB_INCLUDE = `taglib-config --cflags`
  TAGLIB_LIBRARY = `taglib-config --libs`
@@ -9,3 +9,14 @@
  
  CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
  LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
+@@ -18,8 +18,8 @@
+ all: $(EXE)
+ 
+ install: $(EXE)
+-	$(INSTALL) -c -o root -g wheel -m 644 taglookup.1 $(PREFIX)/man/man1/taglookup.1
+-	$(INSTALL) -c -o root -g wheel -m 755 $(EXE) $(PREFIX)/bin/taglookup
++	$(INSTALL) -c -m 644 taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
++	$(INSTALL) -c -m 755 $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
+ 
+ $(EXE): $(OBJ)
+ 	$(CPP) $(LDFLAGS) $(OBJ) -o $(EXE)
diff --git a/audio/taglookup/files/patch-command_line.cpp b/audio/taglookup/files/patch-command_line.cpp
new file mode 100644
index 000000000000..2ee3237c3223
--- /dev/null
+++ b/audio/taglookup/files/patch-command_line.cpp
@@ -0,0 +1,11 @@
+--- ./command_line.cpp.orig	2007-10-01 21:09:46.000000000 +0200
++++ ./command_line.cpp	2014-04-07 10:14:49.462722923 +0200
+@@ -105,7 +105,7 @@
+     
+     bool CommandLineArgumentsParser::parsePort()
+     {
+-        int port = (int)std::strtol(ct_.c_str(), (char**)NULL, 10);
++        int port = (int)strtol(ct_.c_str(), (char**)NULL, 10);
+         
+         if(port > 32767 || port <= 0)
+         {