diff --git a/metadata/com.google.code.geobeagle.txt b/metadata/com.google.code.geobeagle.txt
index 80dad72f39..7850a05b25 100644
--- a/metadata/com.google.code.geobeagle.txt
+++ b/metadata/com.google.code.geobeagle.txt
@@ -1,26 +1,27 @@
-Disabled:Requires GMaps lib and exclusive source of maps
 Category:Navigation
 License:Apache2
 Web Site:http://code.google.com/p/geobeagle/
-Source Code:http://code.google.com/p/geobeagle/source/checkout	
+Source Code:http://code.google.com/p/geobeagle/source/list
 Issue Tracker:http://code.google.com/p/geobeagle/issues/list
 
-Summary:Search for geocaches and letterboxes near you
+Summary:Search for geocaches and letterboxes 
 Description:
 Geocaches are objects that have been hidden in the real world; the game of geocaching is finding these objects around you.
 
-Jacob Paulsen did a YouTube video featuring GeoBeagle here: http://androidsocialmedia.com/apps/geobeagle-geocaching-android-style.
-
-Need more help? Join our discussion group!
-
+Jacob Paulsen did a [http://androidsocialmedia.com/apps/geobeagle-geocaching-android-style YouTube video] 
+featuring GeoBeagle.
 .
 
 Repo Type:hg
 Repo:https://code.google.com/p/geobeagle/
 
+Build Version:1.4.15,206,!wip a868e85b7acf,subdir=trunk/GeoBeagle,\
+extlibs=roboguice/roboguice-1.1.jar;guice-3.0.jar,\
+prebuild=cp -r factory/com/google/code/geobeagle src/com/google/code/geobeagle/ && \
+cp -r factory/roboguice/util/ src/com/google/code/geobeagle/ && \
+sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
+
 Update Check Mode:Market
 Current Version:1.4.15
 Current Version Code:206
 
-#Needs dependencies (unspecified, but at least roboguice)
-#Build Version:1.4.15,206,a868e85b7acf,subdir=trunk/GeoBeagle,extlibs=roboguice/roboguice-1.1.jar
diff --git a/metadata/nl.sogeti.android.gpstracker.txt b/metadata/nl.sogeti.android.gpstracker.txt
index 79da841874..77a3e1bcef 100644
--- a/metadata/nl.sogeti.android.gpstracker.txt
+++ b/metadata/nl.sogeti.android.gpstracker.txt
@@ -2,7 +2,7 @@ AntiFeatures:NonFreeDep
 Category:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/open-gpstracker/
-Source Code:http://code.google.com/p/open-gpstracker/source/checkout
+Source Code:http://code.google.com/p/open-gpstracker/source/list
 Issue Tracker:http://code.google.com/p/open-gpstracker/issues/list
 
 Summary:GPS Logger
@@ -10,10 +10,16 @@ Description:
 An app to record the path you've taken. OpenStreetMap can be used as a map provider by changing
 one of the settings and tracks can by uploaded to OSM from within the app.
 .
-#This could be patched to remove the maps dependency. Then we should do source build
+
+Repo Type:git
+Repo:https://code.google.com/p/open-gpstracker
+
+#Need to patch in dummy oAuth credentials
+Build Version:1.3.4,80,!wip release_1.3.4,subdir=application,prebuild=\
+sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml 
 
 #Device-variable. Using Downloads page which is actually behind the playmarket
 Update Check Mode:None
-Current Version:1.3.2-osmupdate
-Current Version Code:72
+Current Version:1.3.4
+Current Version Code:80