diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 91c29421e100..2305c56c8b66 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.3.1
+PORTVERSION=	8.3.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
 		SF
@@ -14,56 +14,22 @@ MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	A text document format for writing short documents and man pages
 
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
 USE_PYTHON=	2.4+
+USE_GMAKE=	yes
+MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
 
-NO_BUILD=	yes
-
+GNU_CONFIGURE=	yes
 MAN1=		a2x.1 asciidoc.1
 
-pre-patch:
-	${REINPLACE_CMD} \
-		-e "s|/bin/bash|/usr/bin/env bash|g" \
-		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
-		${WRKSRC}/a2x
-	${REINPLACE_CMD} \
-		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
-		${WRKSRC}/asciidoc.py
-
 # a future improvement to this port is to also install the vim syntax
-# highlighing mode in its proper location.
-#
-# also, starting with 8.3.1 the upstream has a configure script. this port
-# should be converted to use it.
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
-	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/asciidoc
-	${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/etc/asciidoc
-	${MKDIR} ${PREFIX}/etc/asciidoc/filters
-	${INSTALL_DATA} ${WRKSRC}/filters/code-filter.conf \
-		${PREFIX}/etc/asciidoc/filters
-	${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
-		${PREFIX}/etc/asciidoc/filters
-	${MKDIR} ${PREFIX}/etc/asciidoc/dblatex
-	${INSTALL_DATA} ${WRKSRC}/dblatex/*.xsl \
-		${PREFIX}/etc/asciidoc/dblatex
-	${INSTALL_DATA} ${WRKSRC}/dblatex/*.sty \
-		${PREFIX}/etc/asciidoc/dblatex
-	${MKDIR} ${PREFIX}/etc/asciidoc/docbook-xsl
-	${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
-		${PREFIX}/etc/asciidoc/docbook-xsl
-	${MKDIR} ${PREFIX}/etc/asciidoc/javascripts
-	${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
-		${PREFIX}/etc/asciidoc/javascripts
-	${MKDIR} ${PREFIX}/etc/asciidoc/stylesheets
-	${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
-		${PREFIX}/etc/asciidoc/stylesheets
-	${MKDIR} ${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
-		${PREFIX}/etc/asciidoc/images/icons
-	${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
-		${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 \
-		${PREFIX}/man/man1
+# highlighing mode which is currently disabled by being patched away in
+# Makefile.in
+
+pre-patch:
+	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
+		${WRKSRC}/a2x ${WRKSRC}/asciidoc.py
 
 .include <bsd.port.mk>
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index eaa7e9f5cc84..e3998742179f 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (asciidoc-8.3.1.tar.gz) = 3e8ea3eab6a6bd89f8fd49fb6d14bfb5
-SHA256 (asciidoc-8.3.1.tar.gz) = a2c4010473948271c074e980d835587a1af77550d87a6423d31ba56b821cb2a8
-SIZE (asciidoc-8.3.1.tar.gz) = 969092
+MD5 (asciidoc-8.3.3.tar.gz) = 1000c15a06efcb96df6b4f2df97cd95e
+SHA256 (asciidoc-8.3.3.tar.gz) = 5a9b82ae0760c05360e1b50edec56287abf4b3eb2abbc564fa5a084b6de201a0
+SIZE (asciidoc-8.3.3.tar.gz) = 1050151
diff --git a/textproc/asciidoc/files/patch-Makefile.in b/textproc/asciidoc/files/patch-Makefile.in
new file mode 100644
index 000000000000..05e0c43e79d3
--- /dev/null
+++ b/textproc/asciidoc/files/patch-Makefile.in
@@ -0,0 +1,30 @@
+--- Makefile.in.orig	2008-12-31 07:33:56.000000000 +0300
++++ Makefile.in	2009-01-15 20:48:23.000000000 +0300
+@@ -4,9 +4,6 @@
+ 
+ .NOTPARALLEL:
+ 
+-INSTALL = @INSTALL@
+-INSTALL_PROG = @INSTALL_PROGRAM@
+-INSTALL_DATA = @INSTALL_DATA@
+ 
+ SED = @SED@
+ 
+@@ -90,7 +87,7 @@
+ 	$(INSTALL) -d $(DESTDIR)/$($@)
+ 
+ $(PROGTARGETS): % : %dir
+-	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
++	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
+ 
+ $(DATATARGETS): % : %dir
+ 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
+@@ -147,7 +144,7 @@
+ 
+ build: fixconfpath
+ 
+-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
++install: $(PROGTARGETS) $(DATATARGETS) renameprog
+ 
+ uninstall: uninstall-vim
+ 	rm -f $(DESTDIR)/$(progdir)/asciidoc
diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist
index 7be77cdb515a..7cd8b224a949 100644
--- a/textproc/asciidoc/pkg-plist
+++ b/textproc/asciidoc/pkg-plist
@@ -11,10 +11,16 @@ etc/asciidoc/docbook-xsl/manpage.xsl
 etc/asciidoc/docbook-xsl/text.xsl
 etc/asciidoc/docbook-xsl/xhtml.xsl
 etc/asciidoc/docbook.conf
-etc/asciidoc/filters/code-filter.conf
-etc/asciidoc/filters/code-filter.py
+etc/asciidoc/filters/code/code-filter.conf
+etc/asciidoc/filters/code/code-filter.py
+etc/asciidoc/filters/graphviz/graphviz-filter.conf
+etc/asciidoc/filters/graphviz/graphviz2png.py
+etc/asciidoc/filters/music/music-filter.conf
+etc/asciidoc/filters/music/music2png.py
+etc/asciidoc/filters/source/source-highlight-filter.conf
 etc/asciidoc/help.conf
 etc/asciidoc/html4.conf
+etc/asciidoc/images/icons/README
 etc/asciidoc/images/icons/callouts/1.png
 etc/asciidoc/images/icons/callouts/10.png
 etc/asciidoc/images/icons/callouts/11.png
@@ -55,6 +61,10 @@ etc/asciidoc/xhtml11-quirks.conf
 etc/asciidoc/xhtml11.conf
 @dirrm etc/asciidoc/dblatex
 @dirrm etc/asciidoc/docbook-xsl
+@dirrm etc/asciidoc/filters/code
+@dirrm etc/asciidoc/filters/graphviz
+@dirrm etc/asciidoc/filters/music
+@dirrm etc/asciidoc/filters/source
 @dirrm etc/asciidoc/filters
 @dirrm etc/asciidoc/images/icons/callouts
 @dirrm etc/asciidoc/images/icons