diff --git a/tuxguitar.spec b/tuxguitar.spec
index 27c6c3d..e242968 100644
--- a/tuxguitar.spec
+++ b/tuxguitar.spec
@@ -1,6 +1,6 @@
 Name:          tuxguitar
 Version:       1.2
-Release:       5mamba
+Release:       6mamba
 Summary:       A Multitrack tablature editor and player
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        openmamba
@@ -57,6 +57,9 @@ sed -i "s|/usr/lib|%{_libdir}|g" build_gcj.sh
 # workaround for builddir dynamic linking
 mkdir -p tuxguitar-1.2-linux-x86-gcj
 ln -s usr/lib tuxguitar-1.2-linux-x86-gcj/lib
+%ifarch x86_64
+export TG_LIBRARY_PATH_JNI=%{_libdir}/jni
+%endif
 sh ./build_gcj.sh 
 rm tuxguitar-1.2-linux-x86-gcj/lib
 
@@ -69,7 +72,10 @@ rmdir tuxguitar-%{version}-linux-x86-gcj/usr/lib
 %endif
 cp -a tuxguitar-%{version}-linux-x86-gcj/* %{buildroot}
 
-mv %{buildroot}%{_bindir}/tuxguitar.bin %{buildroot}%{_bindir}/tuxguitar
+cat > %{buildroot}%{_bindir}/tuxguitar << _EOF
+LD_LIBRARY_PATH=%{_libdir}/eclipse tuxguitar.bin
+_EOF
+chmod 0755 %{buildroot}%{_bindir}/tuxguitar
 
 install -d -m0755 %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
@@ -77,7 +83,7 @@ cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 Encoding=UTF-8
 Name=TuxGuitar
 GenericName=A Multitrack tablature editor and player
-Exec=LD_LIBRARY_PATH=%{_libdir}/eclipse tuxguitar
+Exec=tuxguitar
 Icon=%{_datadir}/tuxguitar/skins/blue_serious/icon-64x64.png
 StartupNotify=true
 Terminal=false
@@ -92,6 +98,7 @@ EOF
 %files
 %defattr(-,root,root)
 %{_bindir}/tuxguitar
+%{_bindir}/tuxguitar.bin
 %{_datadir}/applications/%{name}.desktop
 %{_libdir}/jni/libtuxguitar-alsa-jni.so
 %{_libdir}/jni/libtuxguitar-fluidsynth-jni.so
@@ -156,6 +163,10 @@ EOF
 %{_docdir}/tuxguitar/*
 
 %changelog
+* Fri Dec 05 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2-6mamba
+- add %{_bindir}/tuxguitar wrapper script
+- x86_64: fix jni libdir
+
 * Fri May 16 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2-5mamba
 - rebuilt with gcj 4.9.0