diff --git a/audio/waon/Makefile b/audio/waon/Makefile
index bccd3b5f9f95..d3b2308b0f01 100644
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	waon
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -20,11 +20,15 @@ LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3 \
 
 USE_GNOME=	gtk20
 
+MAN1=		waon.1 pv.1 gwaon.1
 PLIST_FILES=	bin/waon bin/pv bin/gwaon
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/waon  ${PREFIX}/bin/waon
 	${INSTALL_PROGRAM} ${WRKSRC}/pv    ${PREFIX}/bin/pv
 	${INSTALL_PROGRAM} ${WRKSRC}/gwaon ${PREFIX}/bin/gwaon
+	${INSTALL_MAN} ${WRKSRC}/waon.1  ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pv.1    ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/gwaon.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/waon/distinfo b/audio/waon/distinfo
index 34db88d4c6de..5cc9cbc09219 100644
--- a/audio/waon/distinfo
+++ b/audio/waon/distinfo
@@ -1,3 +1,3 @@
-MD5 (waon-0.8.tar.gz) = 74418940418c3162eda880b5744b8c46
-SHA256 (waon-0.8.tar.gz) = 6f27e8d4c4f314208c7712bcb776ffcfaf562205a807a7b52b6bc873cc86787d
-SIZE (waon-0.8.tar.gz) = 65994
+MD5 (waon-0.9.tar.gz) = b31538d1b38f5234a922001c08037c18
+SHA256 (waon-0.9.tar.gz) = 4730d4f744701f4d0092caba2198aa578ed4259d75c4407930b6c68a4513f789
+SIZE (waon-0.9.tar.gz) = 88496
diff --git a/audio/waon/files/patch-Makefile b/audio/waon/files/patch-Makefile
deleted file mode 100644
index 4e66a743a3ca..000000000000
--- a/audio/waon/files/patch-Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-*** Makefile.orig	Wed Dec 31 17:00:00 1969
---- Makefile	Mon Oct  8 18:54:48 2007
-***************
-*** 0 ****
---- 1,92 ----
-+ 
-+ LD	= $(CC)
-+ RM	= rm -f
-+ 
-+ all:	waon pv gwaon
-+ 
-+ CFLAGS += \
-+ 	-Wall -O3 \
-+ 	`pkg-config --cflags fftw3` \
-+ 	`pkg-config --cflags sndfile` \
-+ 	`pkg-config --cflags ao` \
-+ 	`pkg-config --cflags samplerate` \
-+ 	`pkg-config --cflags gtk+-2.0`
-+ 
-+ ## waon
-+ waon_LDFLAGS = \
-+ 	-L/usr/local/lib \
-+ 	`pkg-config --libs fftw3` \
-+ 	`pkg-config --libs sndfile` \
-+ 	-lm
-+ 
-+ waon_OBJS = \
-+ 	main.o \
-+ 	midi.o \
-+ 	analyse.o \
-+ 	fft.o \
-+ 	hc.o \
-+ 	snd.o
-+ 
-+ waon: $(waon_OBJS)
-+ 	$(CC) $(CFLAGS) -o waon $(waon_OBJS) $(waon_LDFLAGS)
-+ 
-+ ## pv
-+ pv_LIBS    =\
-+ 	`pkg-config --libs ao` \
-+ 	`pkg-config --libs sndfile` \
-+ 	`pkg-config --libs fftw3` \
-+ 	`pkg-config --libs samplerate` \
-+ 	-lm
-+ 
-+ pv_LDFLAGS      = 
-+ 
-+ pv_OBJ = \
-+ 	pv.o \
-+ 	pv-complex.o \
-+ 	pv-conventional.o \
-+ 	pv-ellis.o \
-+ 	pv-freq.o \
-+ 	pv-loose-lock.o \
-+ 	hc.o \
-+ 	fft.o \
-+ 	snd.o \
-+ 	ao-wrapper.o
-+ 
-+ 
-+ pv:	$(pv_OBJ)
-+ 	$(LD) $(pv_LDFLAGS) -o pv $(pv_OBJ) $(pv_LIBS)
-+ 
-+ ## gwaon
-+ gwaon_LIBS    = \
-+ 	`pkg-config --libs gtk+-2.0` \
-+ 	`pkg-config --libs ao` \
-+ 	`pkg-config --libs sndfile` \
-+ 	`pkg-config --libs fftw3` \
-+ 	`pkg-config --libs samplerate` \
-+ 	-lm
-+ 
-+ gwaon_LDFLAGS      = 
-+ 
-+ gwaon_OBJ = \
-+ 	gwaon.o \
-+ 	gwaon-menu.o \
-+ 	gwaon-about.o \
-+ 	gwaon-wav.o \
-+ 	gwaon-play.o \
-+ 	pv-complex.o \
-+ 	pv-conventional.o \
-+ 	ao-wrapper.o \
-+ 	gtk-color.o \
-+ 	snd.o \
-+ 	hc.o \
-+ 	fft.o \
-+ 	midi.o
-+ 
-+ gwaon:	$(gwaon_OBJ)
-+ 	$(LD) $(gwaon_LDFLAGS) -o gwaon $(gwaon_OBJ) $(gwaon_LIBS)
-+ 
-+ clean:
-+ 	$(RM) *.o *~ *.core \
-+ 	waon \
-+ 	pv \
-+ 	gwaon