diff --git a/irc/ninja/Makefile b/irc/ninja/Makefile
index 5e6950118b85..f486f25c89d9 100644
--- a/irc/ninja/Makefile
+++ b/irc/ninja/Makefile
@@ -6,21 +6,30 @@
 #
 
 PORTNAME=	ninja
-PORTVERSION=	1.2
+PORTVERSION=	1.5.1
 CATEGORIES=	irc
-MASTER_SITES=	ftp://ninja.qoop.org/ninja/unstable/
-DISTFILES= 	${DISTNAME}-src.tar.gz
+MASTER_SITES=	ftp://ninja.qoop.org/ninja/sources/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 GNU_CONFIGURE=	yes
-PLIST_SUB=	VERSION="${PORTVERSION}"
+CONFIGURE_ENV=	IRCLIB="${IRCLIB}"
+
+IRCLIB=		${PREFIX}/share/ninja
 
 pre-patch:
 	@${CP} ${WRKSRC}/config/configure ${WRKSRC}
 
 post-patch:
-	@${SED} -e s#__PREFIX__#$(PREFIX)#g $(WRKSRC)/include/config.h.dist > $(WRKSRC)/include/config.h.dist.new
-	@${MV} $(WRKSRC)/include/config.h.dist.new $(WRKSRC)/include/config.h.dist
+	@${PERL} -e "s|%%IRCLIB%%|${IRCLIB}|g" ${WRKSRC}/include/config.h.dist
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/source/ninja ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/source/wserv ${PREFIX}/bin
+	@${MKDIR} ${IRCLIB}/translation
+	${INSTALL_DATA} ${WRKSRC}/translation/* ${IRCLIB}/translation
 
 .include <bsd.port.mk>
diff --git a/irc/ninja/distinfo b/irc/ninja/distinfo
index 80f7e29bd267..5b1e0b2639f3 100644
--- a/irc/ninja/distinfo
+++ b/irc/ninja/distinfo
@@ -1 +1 @@
-MD5 (ninja-1.2-src.tar.gz) = 4ab8fca249563733ae1cccbce708bb9b
+MD5 (ninja-1.5.1-src.tar.gz) = 84b5b509e6244c7121c10f9f4d575fbe
diff --git a/irc/ninja/files/patch-aa b/irc/ninja/files/patch-aa
index fd24fc2c4386..84450304b076 100644
--- a/irc/ninja/files/patch-aa
+++ b/irc/ninja/files/patch-aa
@@ -1,11 +1,11 @@
---- include/config.h.dist.orig	Tue May 25 18:37:14 1999
-+++ include/config.h.dist	Tue Jun 15 22:13:10 1999
+--- include/config.h.dist.orig	Wed Sep 27 07:17:23 2000
++++ include/config.h.dist	Wed Jan 17 22:31:50 2001
 @@ -170,7 +170,7 @@
  #define DEFAULT_HACKED_IDENTD NULL
  #define DEFAULT_HELP_PAGER 1
  /*
 -#define DEFAULT_HELP_PATH "/usr/local/lib/ninja/help:/usr/local/lib/irc/help:~/.ninja"
-+#define DEFAULT_HELP_PATH "__PREFIX__/share/ninja/help:/usr/local/lib/irc/help:~/.ninja"
++#define DEFAULT_HELP_PATH "%%IRCLIB%%/help:~/.ninja"
  */
  #define DEFAULT_HELP_PROMPT 1
  #define DEFAULT_HELP_WINDOW 0
diff --git a/irc/ninja/files/patch-ab b/irc/ninja/files/patch-ab
deleted file mode 100644
index b1b114b69f58..000000000000
--- a/irc/ninja/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Jun 15 22:13:08 1999
-+++ configure	Tue Jun 15 22:13:09 1999
-@@ -3822,7 +3822,7 @@
- 
- if test ! -n "$IRCLIB";
- then
--	IRCLIB=\${prefix}/lib/ninja
-+	IRCLIB=\${prefix}/share/ninja
- fi
- 
- if test -n "$nextstep"; then
diff --git a/irc/ninja/pkg-plist b/irc/ninja/pkg-plist
index 4baa9aa91be7..f279bd0417b1 100644
--- a/irc/ninja/pkg-plist
+++ b/irc/ninja/pkg-plist
@@ -1,5 +1,4 @@
 bin/ninja
-bin/ninja-%%VERSION%%
 bin/wserv
 share/ninja/translation/ASCII
 share/ninja/translation/CP437