diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 6c70dd9b22..1c314886d2 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -19,7 +19,7 @@ install the fully-featured proprietary version.
 Status: Newer versions have been published by the author but without source code.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://droid-notify.googlecode.com/svn/trunk
 
 Build Version:2.20,27,707,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index 4e26661c3f..e4df1d5629 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -11,7 +11,7 @@ Star Trek LCARS themed live wallpaper for Android 2.1+ devices that shows
 various system information.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://lcarswallpaper.googlecode.com/svn/trunk/lcarswallpaper
 
 # The manifest has no version code, so let's use the SVN revision number.
diff --git a/metadata/com.google.code.appsorganizer.txt b/metadata/com.google.code.appsorganizer.txt
index 0778b05541..a17118a4cf 100644
--- a/metadata/com.google.code.appsorganizer.txt
+++ b/metadata/com.google.code.appsorganizer.txt
@@ -13,18 +13,17 @@ labels. You can associate labels to applications, uninstall
 applications and create "label shortcuts" on the home screen.
 .
 
-Repo Type:svn
-Repo:http://appsorganizer.googlecode.com/svn/trunk
+Repo Type:git-svn
+Repo:http://appsorganizer.googlecode.com/svn/trunk/AppsOrganizer
 
-Build Version:1.5.14,162,184,subdir=AppsOrganizer
-Build Version:1.5.15,163,185,subdir=AppsOrganizer
-Build Version:1.5.16,164,187,subdir=AppsOrganizer
-Build Version:1.5.18,166,190,subdir=AppsOrganizer
-Build Version:1.5.19,167,191,subdir=AppsOrganizer,target=android-10
+Build Version:1.5.14,162,184
+Build Version:1.5.15,163,185
+Build Version:1.5.16,164,187
+Build Version:1.5.18,166,190
+Build Version:1.5.19,167,191,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5.19
 Current Version Code:167
 
diff --git a/metadata/com.hexad.bluezime.hidenabler.txt b/metadata/com.hexad.bluezime.hidenabler.txt
index f7a4a8f872..b81b4dca16 100644
--- a/metadata/com.hexad.bluezime.hidenabler.txt
+++ b/metadata/com.hexad.bluezime.hidenabler.txt
@@ -12,12 +12,11 @@ No description available
 .
 
 Repo Type:svn
-Repo:http://android-bluez-ime.googlecode.com/svn/trunk
+Repo:http://android-bluez-ime.googlecode.com/svn/trunk/BluezIME-HIDEnabler
 
-Build Version:1.0,1,78,subdir=BluezIME-HIDEnabler
+Build Version:1.0,1,78
 
 Auto Update Mode:None
-#device Variable
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/org.johanhil.flygtider.txt b/metadata/org.johanhil.flygtider.txt
deleted file mode 100644
index 9fd9a4dbd0..0000000000
--- a/metadata/org.johanhil.flygtider.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Disabled:No source for current version and long in the tooth
-Category:Office
-License:Apache2
-Web Site:http://code.google.com/p/flygtider/
-Source Code:http://code.google.com/p/flygtider/source/checkout
-Issue Tracker:http://code.google.com/p/flygtider/issues/list
-
-Auto Name:Flygtider
-Summary:Flight info for Swedish airports
-Description:
-Flygtider is an Android application that lists information about flights
-arriving to/departing from most Swedish airports.
-.
-
-Repo Type:svn
-Repo:http://flygtider.googlecode.com/svn/trunk
-
-# Several versions, including the one available in the market, are
-# missing from the Subversion repository.
-Build Version:0.7,9,23
-Build Version:0.61,8,!This version was never committed
-
-Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.61
-Current Version Code:8
-
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 248d296133..415ca22955 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -11,7 +11,7 @@ Client for DAAP (Digital Audio Access Protocol) servers. Supports streaming,
 queuing, playlists, and searching.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://daap-client.googlecode.com/svn/trunk
 
 Build Version:.9.1,30,62
@@ -24,7 +24,6 @@ Build Version:.9.7+,45,107,forceversion=yes,target=android-8
 Build Version:.9.7++,46,108,forceversion=yes,forcevercode=yes,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:.9.7
 Current Version Code:46