diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile
index 69522a1e61d4..affee6e2ef70 100644
--- a/misc/tinderbox/Makefile
+++ b/misc/tinderbox/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -50,8 +49,8 @@ USE_MYSQL=	yes
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 .if !defined(WITHOUT_CSUP)
-.if ! exists(/usr/bin/csup)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
 .endif
diff --git a/misc/tinderbox/distinfo b/misc/tinderbox/distinfo
index 6c1a8e80946a..6084db5b3cc5 100644
--- a/misc/tinderbox/distinfo
+++ b/misc/tinderbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.1.tar.gz) = f92ff04fa6fef815b6238e164e019752
-SHA256 (tinderbox-2.3.1.tar.gz) = fbeb316c039196c4509231dce374759476a7aa836be333dc8c1656fed71e87b0
-SIZE (tinderbox-2.3.1.tar.gz) = 120573
+MD5 (tinderbox-2.3.2.tar.gz) = f33951c4003330f1ec22a7c3f823f16a
+SHA256 (tinderbox-2.3.2.tar.gz) = 4819dac4be303040c82de11868d49a1cadf81ad151e4d7fb905916b561ff41ff
+SIZE (tinderbox-2.3.2.tar.gz) = 121291
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 69522a1e61d4..affee6e2ef70 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -50,8 +49,8 @@ USE_MYSQL=	yes
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 .if !defined(WITHOUT_CSUP)
-.if ! exists(/usr/bin/csup)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
 .endif
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 6c1a8e80946a..6084db5b3cc5 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.1.tar.gz) = f92ff04fa6fef815b6238e164e019752
-SHA256 (tinderbox-2.3.1.tar.gz) = fbeb316c039196c4509231dce374759476a7aa836be333dc8c1656fed71e87b0
-SIZE (tinderbox-2.3.1.tar.gz) = 120573
+MD5 (tinderbox-2.3.2.tar.gz) = f33951c4003330f1ec22a7c3f823f16a
+SHA256 (tinderbox-2.3.2.tar.gz) = 4819dac4be303040c82de11868d49a1cadf81ad151e4d7fb905916b561ff41ff
+SIZE (tinderbox-2.3.2.tar.gz) = 121291
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 69522a1e61d4..affee6e2ef70 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.3.2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -50,8 +49,8 @@ USE_MYSQL=	yes
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
 .if !defined(WITHOUT_CSUP)
-.if ! exists(/usr/bin/csup)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
 .endif
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index 6c1a8e80946a..6084db5b3cc5 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.1.tar.gz) = f92ff04fa6fef815b6238e164e019752
-SHA256 (tinderbox-2.3.1.tar.gz) = fbeb316c039196c4509231dce374759476a7aa836be333dc8c1656fed71e87b0
-SIZE (tinderbox-2.3.1.tar.gz) = 120573
+MD5 (tinderbox-2.3.2.tar.gz) = f33951c4003330f1ec22a7c3f823f16a
+SHA256 (tinderbox-2.3.2.tar.gz) = 4819dac4be303040c82de11868d49a1cadf81ad151e4d7fb905916b561ff41ff
+SIZE (tinderbox-2.3.2.tar.gz) = 121291