diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index 4ea74441f618..d372a55c2520 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cheesetracker
-PORTVERSION=	0.9.15.2
+PORTVERSION=	0.9.15.4
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -22,9 +22,8 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 
 USE_BZIP2=	yes
 USE_QT_VER=	3
-#MAKE_ENV+=	QTDIR="${QT_PREFIX}"
-SCONS_BUILDENV+=QTDIR="${QT_PREFIX}"
 USE_SCONS=	yes
+SCONS_BUILDENV=	CXX="${CXX}" QTDIR="${QT_PREFIX}"
 
 PORTEXAMPLES=	beek-dolphinisland.it ll-globule.it reduz-maschizo.it \
 		xerxes-mfc.xm
diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo
index 90686f670258..976d29c1310c 100644
--- a/audio/cheesetracker/distinfo
+++ b/audio/cheesetracker/distinfo
@@ -1,3 +1,3 @@
-MD5 (cheesetracker-0.9.15.2.tar.bz2) = 67a5287ce5e8adab1262019e87c438e9
-SHA256 (cheesetracker-0.9.15.2.tar.bz2) = ad0e56cf578819ef723f5a6d4aadd9af5086395475be9adb0c8e0ee9b76afcda
-SIZE (cheesetracker-0.9.15.2.tar.bz2) = 797891
+MD5 (cheesetracker-0.9.15.4.tar.bz2) = cc31ca6776a775f09ebac01ffd1f2a52
+SHA256 (cheesetracker-0.9.15.4.tar.bz2) = 444cee4ee53c72ade6d109c263beac7f36c186bc22cd7ce5f86b095da60e0a02
+SIZE (cheesetracker-0.9.15.4.tar.bz2) = 886475