diff --git a/audio/Makefile b/audio/Makefile
index 408bc3e7748b..9f0c103dd9ee 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -632,6 +632,7 @@
     SUBDIR += tta
     SUBDIR += tuneradio
     SUBDIR += tunesbrowser
+    SUBDIR += tuxguitar
     SUBDIR += twolame
     SUBDIR += ufmcontrol-i18n
     SUBDIR += umix
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
new file mode 100644
index 000000000000..6e58a9bff8ae
--- /dev/null
+++ b/audio/tuxguitar/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:   tuxguitar
+# Date created:        26 April 2007
+# Whom:                Pietro Cerutti (gahr@gahr.ch)
+#
+# $FreeBSD$
+#
+
+PORTNAME=	tuxguitar
+PORTVERSION=	0.9.1
+CATEGORIES=	audio java
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITE_SUBDIR=${PORTNAME}
+DISTNAME=	TuxGuitar-0.9.1-src
+
+MAINTAINER=	gahr@gahr.ch
+COMMENT=	A Multitrack tablature editor and player
+
+BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
+		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext
+
+WRKSRC=		${WRKDIR}/TuxGuitar-0.9.1-src
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
+USE_ANT=	yes
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/TuxGuitar.jar ${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tuxguitar ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/share/ && ${COPYTREE_SHARE} \* ${DATADIR}/)
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/tuxguitar/distinfo b/audio/tuxguitar/distinfo
new file mode 100644
index 000000000000..7b3ccb302f6c
--- /dev/null
+++ b/audio/tuxguitar/distinfo
@@ -0,0 +1,3 @@
+MD5 (TuxGuitar-0.9.1-src.tar.gz) = df2b82aca04919979ab7913a098bcc63
+SHA256 (TuxGuitar-0.9.1-src.tar.gz) = c4e3832e4e4befdfcd86860440b51522409bc90436e4027f4c0581217c53f62c
+SIZE (TuxGuitar-0.9.1-src.tar.gz) = 584005
diff --git a/audio/tuxguitar/files/patch-build-freebsd.xml b/audio/tuxguitar/files/patch-build-freebsd.xml
new file mode 100644
index 000000000000..ef175f7a975f
--- /dev/null
+++ b/audio/tuxguitar/files/patch-build-freebsd.xml
@@ -0,0 +1,63 @@
+--- build-freebsd.xml.orig	Thu Apr 26 14:30:52 2007
++++ build-freebsd.xml	Thu Apr 26 14:30:39 2007
+@@ -0,0 +1,60 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++
++<project name="Tux Guitar" basedir="." >
++    <description>
++        Tux-Guitar
++    </description>
++	
++	<property name="file.script" value="tuxguitar" />
++	<property name="file.properties" value="${src.build.dir}${file.separator}defaults.properties" />
++	
++	<target name="clean" >	
++		<delete quiet="true" file="tuxguitar" />
++	</target>		
++	
++	<target name="install" >	
++		<mkdir dir="${build.bin.dir}" />
++		<copy todir="${build.bin.dir}">
++		    <fileset file="${file.script}"/>
++		</copy>		
++		<chmod file="${build.bin.dir}/${file.script}" perm="755"/>
++	</target>			
++	
++	<target name="build"  >	
++		<echo file="${file.properties}" append="false">font.default=Sans,6,2${line.separator}</echo>
++		<echo file="${file.properties}" append="true">font.note=Sans,7,1${line.separator}</echo>
++		<echo file="${file.properties}" append="true">font.time-signature=Sans,13,3${line.separator}</echo>				
++		<echo file="${file.properties}" append="true">font.printer.default=Sans,6,2${line.separator}</echo>
++		<echo file="${file.properties}" append="true">font.printer.note=Sans,6,0${line.separator}</echo>
++		<echo file="${file.properties}" append="true">font.printer.time-signature=Sans,12,3${line.separator}</echo>		
++		
++		
++		<echo file="${file.script}" append="false">#!/bin/sh${line.separator}</echo>			
++		<echo file="${file.script}" append="true">##SCRIPT DIR${line.separator}</echo>
++		<echo file="${file.script}" append="true">DIR_NAME=`dirname "$0"`${line.separator}</echo>
++		<echo file="${file.script}" append="true">DIR_NAME=`cd "$DIR_NAME"; pwd`${line.separator}</echo>
++		<echo file="${file.script}" append="true">cd "${DIR_NAME}"${line.separator}</echo>
++		<echo file="${file.script}" append="true">##JAVA${line.separator}</echo>
++		<echo file="${file.script}" append="true">if [ "${JAVA}" = "" ]; then${line.separator}</echo>
++		<echo file="${file.script}" append="true">	if [ "${JAVA_HOME}" != "" ]; then${line.separator}</echo>
++		<echo file="${file.script}" append="true">  		JAVA=${JAVA_HOME}/bin/java${line.separator}</echo>
++		<echo file="${file.script}" append="true">	else${line.separator}</echo>
++		<echo file="${file.script}" append="true">  		JAVA=java${line.separator}</echo>
++		<echo file="${file.script}" append="true">	fi${line.separator}</echo>
++		<echo file="${file.script}" append="true">fi${line.separator}</echo>
++		<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
++		<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${build.jar.dir}TuxGuitar.jar:${lib.swt.jar}:${lib.itext.jar}:${build.share.dir}${line.separator}</echo>
++		<echo file="${file.script}" append="true">##LIBRARY_PATH${line.separator}</echo>
++		<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${lib.swt.jni}${line.separator}</echo>
++		<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
++		<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TuxGuitar${line.separator}</echo>
++		<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
++		<echo file="${file.script}" append="true">VM_ARGS="-Xms128m -Xmx128m"${line.separator}</echo>
++		<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
++		<echo file="${file.script}" append="true">${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2"${line.separator}</echo>
++		<chmod file="${file.script}" perm="755"/>
++	</target>		
++	
++	<target name="package" />	
++	
++</project>
diff --git a/audio/tuxguitar/files/patch-build.properties b/audio/tuxguitar/files/patch-build.properties
new file mode 100644
index 000000000000..faa6df6a761b
--- /dev/null
+++ b/audio/tuxguitar/files/patch-build.properties
@@ -0,0 +1,64 @@
+--- build.properties.orig	Tue Jan 22 22:30:10 2008
++++ build.properties	Thu Apr 26 22:47:43 2007
+@@ -1,51 +1,11 @@
+-########## DEFAULT LINUX BUILD PROPERTIES ##########
+-lib.swt.jni=lib/
+-lib.swt.jar=lib/swt.jar
+-lib.itext.jar=lib/itext-1.4.5.jar
+-lib.janel-ant.jar=lib/janel-ant-0.1.jar
++########## FREEBSD BUILD PROPERTIES ##########
++lib.swt.jni=/usr/local/lib
++lib.swt.jar=/usr/local/share/java/classes/swt.jar
++lib.itext.jar=/usr/local/share/java/classes/itext.jar
+ build.version=0.9
+-build.dist=linux
+-build.jar.dir=./
+-build.bin.dir=./
+-build.share.dir=./share/
+-build.doc.dir=./doc/
++build.dist=freebsd
++build.jar.dir=/usr/local/share/java/classes/
++build.bin.dir=/usr/local/bin
++build.share.dir=/usr/local/share/tuxguitar/
++build.doc.dir=/usr/local/share/doc/TuxGuitar-${build.version}
+ build.manifest.classpath=${lib.swt.jar} ${lib.itext.jar} ${build.share.dir}
+-
+-########## UBUNTU DAPPER BUILD PROPERTIES ##########
+-#lib.swt.jni=/usr/lib/jni/
+-#lib.swt.jar=/usr/lib/java/swt.jar
+-#lib.itext.jar=/usr/lib/java/itext-1.4.5.jar
+-#build.version=0.9-ubuntu-6.10-1
+-#build.dist=ubuntu
+-#build.prefix=/usr
+-#build.jar.dir=${build.prefix}/lib/java/
+-#build.bin.dir=${build.prefix}/bin/
+-#build.share.dir=${build.prefix}/share/TuxGuitar-${build.version}/
+-#build.doc.dir=${build.prefix}/share/doc/TuxGuitar-${build.version}/
+-#build.manifest.classpath=${lib.swt.jar} ./itext-1.4.2.jar ${build.share.dir}
+-
+-########## DEFAULT MAC BUILD PROPERTIES ##########
+-#lib.swt.jni=lib/
+-#lib.swt.jar=lib/swt.jar
+-#lib.itext.jar=lib/itext-1.4.5.jar
+-#lib.janel-ant.jar=lib/janel-ant-0.1.jar
+-#build.version=0.9
+-#build.dist=mac
+-#build.jar.dir=./
+-#build.bin.dir=./
+-#build.share.dir=./share/
+-#build.doc.dir=./doc/
+-#build.manifest.classpath=${lib.swt.jar} ${lib.itext.jar} ${build.share.dir}
+-
+-########## WINDOWS BUILD PROPERTIES ############
+-#lib.swt.jni=lib\\
+-#lib.swt.jar=lib\\swt.jar
+-#lib.itext.jar=lib\\itext-1.4.5.jar
+-#lib.janel-ant.jar=lib\\janel-ant-0.1.jar
+-#build.version=0.9
+-#build.dist=windows
+-#build.jar.dir=
+-#build.bin.dir=
+-#build.share.dir=share\\
+-#build.doc.dir=doc\\
+-#build.manifest.classpath=${lib.swt.jar} ${lib.itext.jar} ${build.share.dir}
+\ No newline at end of file
diff --git a/audio/tuxguitar/pkg-descr b/audio/tuxguitar/pkg-descr
new file mode 100644
index 000000000000..88e91a06388b
--- /dev/null
+++ b/audio/tuxguitar/pkg-descr
@@ -0,0 +1,17 @@
+With TuxGuitar, you will be able to compose music using the following features
+
+    * Tablature editor
+    * Score Viewer
+    * Multitrack display
+    * Autoscroll while playing
+    * Note duration management
+    * Various effects (bend, slide, vibrato, hammer-on/pull-off)
+    * Support for triplets (5,6,7,9,10,11,12)
+    * Repeat open and close
+    * Time signature management
+    * Tempo management
+    * Imports and exports gp3,gp4 and gp5 files
+
+
+
+WWW: http://www.tuxguitar.com.ar/
diff --git a/audio/tuxguitar/pkg-plist b/audio/tuxguitar/pkg-plist
new file mode 100644
index 000000000000..e60f77b31d00
--- /dev/null
+++ b/audio/tuxguitar/pkg-plist
@@ -0,0 +1,165 @@
+bin/tuxguitar
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/java/classes/TuxGuitar.jar
+%%DATADIR%%/files/1.png
+%%DATADIR%%/files/16.png
+%%DATADIR%%/files/2.png
+%%DATADIR%%/files/32.png
+%%DATADIR%%/files/4.png
+%%DATADIR%%/files/64.png
+%%DATADIR%%/files/8.png
+%%DATADIR%%/files/about_authors.png
+%%DATADIR%%/files/about_description.png
+%%DATADIR%%/files/about_license.png
+%%DATADIR%%/files/bend.gif
+%%DATADIR%%/files/chord.png
+%%DATADIR%%/files/clef_alto.png
+%%DATADIR%%/files/clef_bass.png
+%%DATADIR%%/files/clef_tenor.png
+%%DATADIR%%/files/clef_treble.png
+%%DATADIR%%/files/closerepeat.png
+%%DATADIR%%/files/deadnote.png
+%%DATADIR%%/files/dotted.png
+%%DATADIR%%/files/doubledotted.png
+%%DATADIR%%/files/dynamic_f.png
+%%DATADIR%%/files/dynamic_ff.png
+%%DATADIR%%/files/dynamic_fff.png
+%%DATADIR%%/files/dynamic_mf.png
+%%DATADIR%%/files/dynamic_mp.png
+%%DATADIR%%/files/dynamic_p.png
+%%DATADIR%%/files/dynamic_pp.png
+%%DATADIR%%/files/dynamic_ppp.png
+%%DATADIR%%/files/edit_mode_edition.png
+%%DATADIR%%/files/edit_mode_edition_no_natural.png
+%%DATADIR%%/files/edit_mode_selection.png
+%%DATADIR%%/files/effect_accentuated.png
+%%DATADIR%%/files/effect_bend.png
+%%DATADIR%%/files/effect_dead.png
+%%DATADIR%%/files/effect_fade_in.png
+%%DATADIR%%/files/effect_ghost.png
+%%DATADIR%%/files/effect_grace.png
+%%DATADIR%%/files/effect_hammer.png
+%%DATADIR%%/files/effect_harmonic.png
+%%DATADIR%%/files/effect_heavy_accentuated.png
+%%DATADIR%%/files/effect_palm_mute.png
+%%DATADIR%%/files/effect_popping.png
+%%DATADIR%%/files/effect_slapping.png
+%%DATADIR%%/files/effect_slide.png
+%%DATADIR%%/files/effect_staccato.png
+%%DATADIR%%/files/effect_tapping.png
+%%DATADIR%%/files/effect_tremolo_bar.png
+%%DATADIR%%/files/effect_tremolo_picking.png
+%%DATADIR%%/files/effect_trill.png
+%%DATADIR%%/files/effect_vibrato.png
+%%DATADIR%%/files/firstfret.png
+%%DATADIR%%/files/flat.gif
+%%DATADIR%%/files/fret.png
+%%DATADIR%%/files/fretboard.png
+%%DATADIR%%/files/grace.png
+%%DATADIR%%/files/icon-16x16.png
+%%DATADIR%%/files/icon-32x32.png
+%%DATADIR%%/files/icon-48x48.png
+%%DATADIR%%/files/icon-64x64.png
+%%DATADIR%%/files/icon-96x96.png
+%%DATADIR%%/files/icon.icns
+%%DATADIR%%/files/icon.png
+%%DATADIR%%/files/langoption.gif
+%%DATADIR%%/files/layout_linear.png
+%%DATADIR%%/files/layout_multitrack.png
+%%DATADIR%%/files/layout_page.png
+%%DATADIR%%/files/layout_score.png
+%%DATADIR%%/files/marker_add.png
+%%DATADIR%%/files/marker_first.png
+%%DATADIR%%/files/marker_last.png
+%%DATADIR%%/files/marker_list.png
+%%DATADIR%%/files/marker_next.png
+%%DATADIR%%/files/marker_previous.png
+%%DATADIR%%/files/marker_remove.png
+%%DATADIR%%/files/mixer.png
+%%DATADIR%%/files/mixer_metronome.png
+%%DATADIR%%/files/natural.gif
+%%DATADIR%%/files/new.png
+%%DATADIR%%/files/open.png
+%%DATADIR%%/files/openrepeat.png
+%%DATADIR%%/files/option_sound.png
+%%DATADIR%%/files/option_style.png
+%%DATADIR%%/files/option_toolbars.png
+%%DATADIR%%/files/option_view.png
+%%DATADIR%%/files/print-preview.png
+%%DATADIR%%/files/print.png
+%%DATADIR%%/files/rect52758.png
+%%DATADIR%%/files/redo.png
+%%DATADIR%%/files/save-as.png
+%%DATADIR%%/files/save.png
+%%DATADIR%%/files/sharp.gif
+%%DATADIR%%/files/silence1.gif
+%%DATADIR%%/files/silence1.png
+%%DATADIR%%/files/silence16.gif
+%%DATADIR%%/files/silence16.png
+%%DATADIR%%/files/silence2.gif
+%%DATADIR%%/files/silence2.png
+%%DATADIR%%/files/silence32.gif
+%%DATADIR%%/files/silence32.png
+%%DATADIR%%/files/silence4.gif
+%%DATADIR%%/files/silence4.png
+%%DATADIR%%/files/silence64.gif
+%%DATADIR%%/files/silence64.png
+%%DATADIR%%/files/silence8.gif
+%%DATADIR%%/files/silence8.png
+%%DATADIR%%/files/song_properties.png
+%%DATADIR%%/files/splash.png
+%%DATADIR%%/files/tempo.png
+%%DATADIR%%/files/tempoicon.png
+%%DATADIR%%/files/tiednote.png
+%%DATADIR%%/files/timesignature.png
+%%DATADIR%%/files/track_add.png
+%%DATADIR%%/files/track_remove.png
+%%DATADIR%%/files/transport.png
+%%DATADIR%%/files/transport_first_1.png
+%%DATADIR%%/files/transport_first_2.png
+%%DATADIR%%/files/transport_icon_first_1.png
+%%DATADIR%%/files/transport_icon_first_2.png
+%%DATADIR%%/files/transport_icon_last_1.png
+%%DATADIR%%/files/transport_icon_last_2.png
+%%DATADIR%%/files/transport_icon_next_1.png
+%%DATADIR%%/files/transport_icon_next_2.png
+%%DATADIR%%/files/transport_icon_pause.png
+%%DATADIR%%/files/transport_icon_play_1.png
+%%DATADIR%%/files/transport_icon_play_2.png
+%%DATADIR%%/files/transport_icon_previous_1.png
+%%DATADIR%%/files/transport_icon_previous_2.png
+%%DATADIR%%/files/transport_icon_stop_1.png
+%%DATADIR%%/files/transport_icon_stop_2.png
+%%DATADIR%%/files/transport_last_1.png
+%%DATADIR%%/files/transport_last_2.png
+%%DATADIR%%/files/transport_next_1.png
+%%DATADIR%%/files/transport_next_2.png
+%%DATADIR%%/files/transport_pause.png
+%%DATADIR%%/files/transport_play_1.png
+%%DATADIR%%/files/transport_play_2.png
+%%DATADIR%%/files/transport_previous_1.png
+%%DATADIR%%/files/transport_previous_2.png
+%%DATADIR%%/files/transport_stop_1.png
+%%DATADIR%%/files/transport_stop_2.png
+%%DATADIR%%/files/tremolo_bar.png
+%%DATADIR%%/files/triplet_feel_1.png
+%%DATADIR%%/files/triplet_feel_2.png
+%%DATADIR%%/files/triplet_feel_3.png
+%%DATADIR%%/files/tupleto.png
+%%DATADIR%%/files/undo.png
+%%DATADIR%%/lang/messages.properties
+%%DATADIR%%/lang/messages_de.properties
+%%DATADIR%%/lang/messages_en.properties
+%%DATADIR%%/lang/messages_es.properties
+%%DATADIR%%/lang/messages_fr.properties
+%%DATADIR%%/lang/messages_pl.properties
+%%DATADIR%%/lang/messages_pt.properties
+%%DATADIR%%/scales/scales.xml
+@dirrm %%DATADIR%%/scales
+@dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/files
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%