diff --git a/sci-geosciences/garminplugin/Manifest b/sci-geosciences/garminplugin/Manifest
index 46e85e3..fede9a8 100644
--- a/sci-geosciences/garminplugin/Manifest
+++ b/sci-geosciences/garminplugin/Manifest
@@ -1,2 +1,4 @@
 DIST garminplugin-0.3.3.tar.gz 123929 RMD160 c6cb323f8639b969a7817f67e7b86bde7a1e2405 SHA1 f2c4043b35bd2d38afd0ba8987a06561bea59186 SHA256 771c986076c9cd7743f0484379b076e9ad99ee9e051d366024179a1a76a24ec8
+DIST garminplugin-0.3.7.tar.gz 140153 RMD160 be6a46bef3497e2600bba40d12f2aa4b428cf557 SHA1 457e9dd41e0d230bc7feb27470320f5627272b9d SHA256 cffdd9845f19a96d4998b3f162ee39de29f439a181878b47e4704c1681414cae
 EBUILD garminplugin-0.3.3.ebuild 948 RMD160 4e8ec0375b4b628b6d0023f67339d94ba6e68a3e SHA1 602d2efea480dc5f5e89fb7082febc95fd0b679a SHA256 4c80d10fe24095753d1d61b87ddf8ec3ed1428183d9d0e4c43310739daf53097
+EBUILD garminplugin-0.3.7.ebuild 950 RMD160 6e5b87a6df06126ead875f4dce73af54153999f2 SHA1 a9ff4c77034e585193392bce9bd396af62a4c457 SHA256 03e4a947a7671ccd9350c0f9192162bbde0310ca4ac1d2ef5cb936edaba5960c
diff --git a/sci-geosciences/garminplugin/garminplugin-0.3.7.ebuild b/sci-geosciences/garminplugin/garminplugin-0.3.7.ebuild
new file mode 100644
index 0000000..21138d9
--- /dev/null
+++ b/sci-geosciences/garminplugin/garminplugin-0.3.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2011 Christian Wasserthal
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="A free replacement for the Garmin browser plugin"
+HOMEPAGE="http://www.andreas-diesner.de/garminplugin/"
+
+SRC_URI="http://github.com/adiesner/GarminPlugin/tarball/V${PV} -> ${P}.tar.gz"
+MY_S="adiesner-GarminPlugin-f2ebb7f"
+
+LICENSE="GPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="sci-geosciences/garmintools
+	sci-geosciences/gpsbabel
+	dev-libs/tinyxml[stl]
+	dev-libs/libusb"
+
+DEPEND="${RDEPEND}"
+
+#src_unpack(){
+#	tar -zxf "${DISTDIR}/${A}" || die "unpack failed"
+#}
+
+src_configure() {
+	cd "${MY_S}/src" || die "barf"
+	econf || die "econf failed"
+}
+
+src_compile() {
+	cd "${MY_S}/src" || die "barf"
+	emake || die "emake failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/lib/nsbrowser/plugins" || die "mkdir failed"
+	cp "${MY_S}/src/npGarminPlugin.so" "${D}/usr/lib/nsbrowser/plugins/" || die "cp failed"
+}
diff --git a/sci-geosciences/garmintools/Manifest b/sci-geosciences/garmintools/Manifest
index d971331..727b94e 100644
--- a/sci-geosciences/garmintools/Manifest
+++ b/sci-geosciences/garmintools/Manifest
@@ -1,5 +1,6 @@
 AUX garmintools-0.05-r1-add-xml-root.patch 419 RMD160 59a14e10c34c698bc31cdf68f32fab22d455c2eb SHA1 f743850854f2d3da42844c238719d9261505f031 SHA256 58802fbddf121cc9c2236fac5220895248854e438bee2e43a35b2129ffa7f7a2
+AUX garmintools-0.10-add-xml-root.patch 419 RMD160 59a14e10c34c698bc31cdf68f32fab22d455c2eb SHA1 f743850854f2d3da42844c238719d9261505f031 SHA256 58802fbddf121cc9c2236fac5220895248854e438bee2e43a35b2129ffa7f7a2
 DIST garmintools-0.05.tar.gz 377015 RMD160 fb0148defa4a19d839baecab783eece40e197de9 SHA1 8c5da0e9b00305639b64d221e67eabd5792b2445 SHA256 d3a293ea64a26c660c7f8e9f24741ff5986fc114876974744900402fb2ae1a3b
 DIST garmintools-0.10.tar.gz 396659 RMD160 307cd9bc99288c2305324c05792022c457ef5e5d SHA1 f59a761b09575d27abbf5d76811f7ec25a1cbd26 SHA256 ffd50b7f963fa9b8ded3223c4786b07906c887ed900de64581a24ff201444cee
 EBUILD garmintools-0.05-r1.ebuild 861 RMD160 b285ad84262c3f520b840faf35f88aac4f2faf46 SHA1 6bc430ec2b29c910ec5b620347b7ab56ed49dc97 SHA256 36c781f27314fb74a132b9ab5e0fc5f535fd78099270a4271bfca2bca0ed54ba
-EBUILD garmintools-0.10.ebuild 856 RMD160 32513499d402d3005983f6ce919b42fb24a91289 SHA1 5a08baa363ffabcdaedff9e57b837bcc3fa5b26a SHA256 318082bd529e10156b442962f96d992b2144e4ba81d08b67587aaf34ac1a48ab
+EBUILD garmintools-0.10.ebuild 863 RMD160 7bd67b91d9cae72de4003e30a8d582e55b34663f SHA1 40586e0e66966b3c01e8fc3c7405c57ba73836de SHA256 efc1b50d643e83583199e162a348683ae201de72c93c632126ca415586273de0
diff --git a/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch b/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch
new file mode 100644
index 0000000..931d201
--- /dev/null
+++ b/sci-geosciences/garmintools/files/garmintools-0.10-add-xml-root.patch
@@ -0,0 +1,17 @@
+--- src/garmin_dump.c~	2007-07-20 13:59:04.000000000 -0400
++++ src/garmin_dump.c	2007-08-27 21:02:04.000000000 -0400
+@@ -9,12 +9,14 @@
+   garmin_data * data;
+   int           i;
+ 
++  printf("<data>\n");
+   for ( i = 1; i < argc; i++ ) {    
+     if ( (data = garmin_load(argv[i])) != NULL ) {
+       garmin_print_data(data,stdout,0);
+       garmin_free_data(data);
+     }
+   }
++  printf("</data>\n");
+ 
+   return 0;
+ }
diff --git a/sci-geosciences/garmintools/garmintools-0.10.ebuild b/sci-geosciences/garmintools/garmintools-0.10.ebuild
index 4fed94a..093ea82 100644
--- a/sci-geosciences/garmintools/garmintools-0.10.ebuild
+++ b/sci-geosciences/garmintools/garmintools-0.10.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="x86"
+KEYWORDS="~x86 ~amd64"
 
 IUSE="usb"
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
-#	epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch"
+	epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch"
 }
 
 src_compile() {