diff --git a/srcpkgs/gpsbabel-gui b/srcpkgs/gpsbabel-gui
deleted file mode 120000
index 2f617d763ff..00000000000
--- a/srcpkgs/gpsbabel-gui
+++ /dev/null
@@ -1 +0,0 @@
-./gpsbabel
\ No newline at end of file
diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 65dbd0c0e7b..e33febf68eb 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -7,44 +7,34 @@ maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
 homepage="http://www.gpsbabel.org/"
 license="GPL-2"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
-hostmakedepends="perl>=5.20 docbook-xml xmlwf offo-hyphenation"
-makedepends="qt-devel libusb-compat-devel expat-devel libxml2-devel libxslt-devel"
+hostmakedepends="perl>=5.20 docbook-xml xmlwf openjdk-jre offo-hyphenation"
+makedepends="qt-devel libusb-compat-devel expat-devel libxslt-devel"
+depends="desktop-file-utils"
 distfiles="http://arch.p5n.pp.ru/~sergej/dl/2014/${pkgname}-${version}.tar.gz"
 checksum="3feec7d43ca6cb5393645fe0df893d9f7bf5334849fa8abd4c5c3ee775c8cac3"
 
-#Error: JAVA_HOME is not defined correctly.
-#  We cannot execute /usr/lib/jvm/openjdk/bin/java
-#  Makefile:262: recipe for target 'gpsbabel.pdf' failed
-broken=1
+replaces="gpsbabel-gui>=0"
 
 do_build(){
-    export JAVA_HOME=/usr/lib/jvm/openjdk
-    make
+    . /etc/profile.d/10_openjdk.sh
+    make ${makejobs}
     make doc
     cd gui
     qmake
-    make
+    make ${makejobs}
 }
 
 do_install(){
    make install DESTDIR=${DESTDIR}
    vmkdir usr/share/doc/${pkgname}
    vcopy "README* AUTHORS COPYING gpsbabel.pdf gpsbabel-sample.ini guibabel style" usr/share/doc/${pkgname}
+   vinstall ${wrksrc}/gui/gpsbabelfe 755 usr/bin
+   vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 755 usr/bin
+   vinstall ${wrksrc}/gui/gpsbabel.desktop 644 usr/share/applications
+   vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 }
 
 do_clean() {
    # Remove temporary stuff from masterdir
    rm -rf ${XBPS_BUILDDIR}/babelweb
 }
-
-gpsbabel-gui_package() {
-    short_desc+=" - Qt4 GUI"
-    depends="${sourcepkg}>=${version}_${revision} desktop-file-utils"
-    pkg_install() {
-        vinstall ${wrksrc}/gui/gpsbabelfe 755 usr/bin
-        vinstall ${wrksrc}/gui/objects/gpsbabelfe-bin 755 usr/bin
-        vinstall ${wrksrc}/gui/gpsbabel.desktop 644 usr/share/applications
-        vinstall ${wrksrc}/gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
-    }
-}
-