diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 713ae56ce427..5099ecbc2fae 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -1,37 +1,36 @@
 # ex:ts=8
 # Ports collection makefile for:	qgo
 # Date created:			Mar 22, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qgo
-PORTVERSION=	1.0.4.2
+PORTVERSION=	1.5.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Go board and SGF editor written with the Qt library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_QT_VER=	3
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|src templates|src|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/qgo/distinfo b/games/qgo/distinfo
index 41e4e99e291b..49e57edbbfc2 100644
--- a/games/qgo/distinfo
+++ b/games/qgo/distinfo
@@ -1,3 +1,3 @@
-MD5 (qgo-1.0.4-r2.tar.gz) = 49da743ca769d8d18fc3a4b7a6aa0bf8
-SHA256 (qgo-1.0.4-r2.tar.gz) = b57c07b8270b0da8ea15a146b637e1a9c2c550f306d80ed700ead97ef76244da
-SIZE (qgo-1.0.4-r2.tar.gz) = 2316848
+MD5 (qgo-1.5-r1.tar.gz) = 1051f540aa4e1a83a29ec6be3896c2c2
+SHA256 (qgo-1.5-r1.tar.gz) = ee3d18f00e373f1b547eff68866b557f25b49cc14d83350b429302b0460a8a74
+SIZE (qgo-1.5-r1.tar.gz) = 2325097
diff --git a/games/qgo/files/patch-src-mainwidget_gui.ui b/games/qgo/files/patch-src-mainwidget_gui.ui
deleted file mode 100644
index 946b0258f849..000000000000
--- a/games/qgo/files/patch-src-mainwidget_gui.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mainwidget_gui.ui.orig	Tue Sep 27 20:54:48 2005
-+++ src/mainwidget_gui.ui	Tue Sep 27 20:55:06 2005
-@@ -2447,7 +2447,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>board.h</includehint>
--    <includehint>normaltools.h</includehint>
-     <includehint>gametree.h</includehint>
- </includehints>
- </UI>
diff --git a/games/qgo/files/patch-src__mainwin.cpp b/games/qgo/files/patch-src__mainwin.cpp
index d8ce8705035e..b08df9f2238f 100644
--- a/games/qgo/files/patch-src__mainwin.cpp
+++ b/games/qgo/files/patch-src__mainwin.cpp
@@ -1,15 +1,16 @@
---- src/mainwin.cpp.orig	Thu Nov 24 08:38:33 2005
-+++ src/mainwin.cpp	Wed Jan 18 03:09:52 2006
-@@ -1604,10 +1604,10 @@
-       //set the params of "who command"
- 	if ((whoBox1->currentItem() >1)  || (whoBox2->currentItem() >1))
-         {
--		wparam.append(whoBox1->currentItem()==1 ? "9p" : whoBox1->currentText());
-+		wparam.append(whoBox1->currentItem()==1 ? QString("9p") : whoBox1->currentText());
- 		if ((whoBox1->currentItem())  && (whoBox2->currentItem()))
- 			wparam.append("-");
--		wparam.append(whoBox2->currentItem()==1 ? "9p" : whoBox2->currentText());
-+		wparam.append(whoBox2->currentItem()==1 ? QString("9p") : whoBox2->currentText());
-          } 
- 	else if ((whoBox1->currentItem())  || (whoBox2->currentItem()))
-         	wparam.append("1p-9p");
+--- src/mainwin.cpp.orig	Mon Mar 27 06:37:41 2006
++++ src/mainwin.cpp	Wed Apr 12 13:36:58 2006
+@@ -1589,11 +1589,11 @@
+       			//set the params of "who command"
+ 			if ((whoBox1->currentItem() >1)  || (whoBox2->currentItem() >1))
+         		{
+-				wparam.append(whoBox1->currentItem()==1 ? "9p" : whoBox1->currentText());
++				wparam.append(whoBox1->currentItem()==1 ? QString("9p") : whoBox1->currentText());
+ 				if ((whoBox1->currentItem())  && (whoBox2->currentItem()))
+ 					wparam.append("-");
+ 
+-				wparam.append(whoBox2->currentItem()==1 ? "9p" : whoBox2->currentText());
++				wparam.append(whoBox2->currentItem()==1 ? QString("9p") : whoBox2->currentText());
+          		} 
+ 			else if ((whoBox1->currentItem())  || (whoBox2->currentItem()))
+         			wparam.append("1p-9p");