diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index 56e7f69cfafc..8063846dae72 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -6,34 +6,30 @@
 #
 
 PORTNAME=	qpxtool
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@amdmi3.ru
 COMMENT=	A GUI for testing CD/DVD quality and transfer rate
 
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_QT_VER=	3
 
-USE_SCONS=	yes
-SCONS_BUILDENV=	QTDIR="${QT_PREFIX}" TMPDIR="${TMPDIR}" ${SCONS_ENV}
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
+MAKE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
+		QTDIR="${QT_PREFIX}"
 
 USE_LDCONFIG=	yes
+MAN8=		pxcontrol.8 pxfw.8
 
-PORTDOCS=	README ChangeLog
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/lib/lib/* ${PREFIX}/lib/
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Wall -g -O2||; s|/usr/local|${PREFIX}|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^LDLIBS.*+=/ s|$$| -lcam|' \
+		${WRKSRC}/lib/qpxtransport/Makefile
 
 .include <bsd.port.mk>
diff --git a/sysutils/qpxtool/distinfo b/sysutils/qpxtool/distinfo
index 784954b9d11c..098ce42bca20 100644
--- a/sysutils/qpxtool/distinfo
+++ b/sysutils/qpxtool/distinfo
@@ -1,3 +1,3 @@
-MD5 (qpxtool-0.6.tar.bz2) = 90e846ef5eecd448b8d4ab51eb1b9bf1
-SHA256 (qpxtool-0.6.tar.bz2) = 7752bd99456c22d1060e58bf7bae3f569258e37da6ba32342e6b75093eb1c9e0
-SIZE (qpxtool-0.6.tar.bz2) = 149677
+MD5 (qpxtool-0.6.1.tar.bz2) = 4fa7ce8aa9c13aa2db0a8b5224acb906
+SHA256 (qpxtool-0.6.1.tar.bz2) = ee0c1d0be57a4efd6e458867863fcf460ae7e155e3b674bd525ad4dcd13dcb59
+SIZE (qpxtool-0.6.1.tar.bz2) = 156636
diff --git a/sysutils/qpxtool/files/patch-SConstruct b/sysutils/qpxtool/files/patch-SConstruct
deleted file mode 100644
index b7a34a84b870..000000000000
--- a/sysutils/qpxtool/files/patch-SConstruct
+++ /dev/null
@@ -1,22 +0,0 @@
---- SConstruct.orig	Mon Aug 21 01:37:36 2006
-+++ SConstruct	Wed Sep 20 17:30:38 2006
-@@ -16,19 +16,6 @@
- 		env.Replace( **{key: os.environ[key].split(' ')} )
- 
- 
--env.Alias('install', ['/usr/local/bin', '/usr/local/lib' ])
--env.Alias('install-lib', '/usr/local/lib')
--
--env.Install( '/usr/local/bin',
--	     [ 'bin/qpxtool',
--	       'bin/pxcontrol',
--	       'bin/pioquiet'])
--env.Install( '/usr/local/lib',
--             [ 'lib/lib/libqpxtransport.so',
--	       'lib/lib/libqpxscan.so',
--	       'lib/lib/libqpxplextor.so',
--	       'lib/lib/libqpxpioneer.so'])
--
- Export('env')
- 
- SConscript('lib/qpxtransport/SConscript')
diff --git a/sysutils/qpxtool/pkg-plist b/sysutils/qpxtool/pkg-plist
index c1d7673607e4..709583ef5af5 100644
--- a/sysutils/qpxtool/pkg-plist
+++ b/sysutils/qpxtool/pkg-plist
@@ -1,7 +1,31 @@
+bin/deadreader
 bin/pioquiet
 bin/pxcontrol
+bin/pxfw
 bin/qpxtool
+include/common_functions.h
+include/media_check_benq.h
+include/media_check_benq_rom.h
+include/media_check_generic.h
+include/media_check_liteon.h
+include/media_check_nec.h
+include/media_check_pioneer.h
+include/pioneer_spdctl.h
+include/plextor_features.h
+include/plextor_qcheck.h
+include/qpx_mmc.h
+include/qpx_opcodes.h
+include/qpx_transport.h
+include/scan_pointers.h
 lib/libqpxpioneer.so
+lib/libqpxpioneer.so.0
+lib/libqpxpioneer.so.0.6.0
 lib/libqpxplextor.so
+lib/libqpxplextor.so.0
+lib/libqpxplextor.so.0.6.1
 lib/libqpxscan.so
+lib/libqpxscan.so.0
+lib/libqpxscan.so.0.6.1
 lib/libqpxtransport.so
+lib/libqpxtransport.so.0
+lib/libqpxtransport.so.0.6.3