diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index d2bf10d78896..9fea9cdc44f7 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -7,23 +7,37 @@
 
 PORTNAME=	timemachine
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://plugin.org.uk/timemachine/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JACK audio capture tool
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
+		lo.7:${PORTSDIR}/audio/liblo \
 		sndfile.1:${PORTSDIR}/audio/libsndfile
 
-GNU_CONFIGURE=	yes
+OPTIONS=	LASH "Enable LASH support" off
+
+USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/liblash.so.2)
+.if defined(WITH_LASH)
 LIB_DEPENDS+=	lash.2:${PORTSDIR}/audio/lash
+.else
+CONFIGURE_ARGS+=--disable-lash
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^PACKAGE_CFLAGS=/s|-g||; \
+		 /^PACKAGE_LIBS=/s|-g||' ${WRKSRC}/configure
+
+.include <bsd.port.mk>