diff --git a/metadata/cc.rainwave.android.txt b/metadata/cc.rainwave.android.txt
new file mode 100644
index 0000000000..a050d9ef40
--- /dev/null
+++ b/metadata/cc.rainwave.android.txt
@@ -0,0 +1,27 @@
+Categories:Multimedia
+License:NewBSD
+Web Site:http://rainwave.cc
+Source Code:https://github.com/OEP/rainwave-android
+Issue Tracker:https://github.com/OEP/rainwave-android/issues
+
+Auto Name:Rainwave
+Summary:Client for music station
+Description:
+Rainwave.cc is an icecast music station and with the app you can
+listen to the music via *[[com.android.music]] or [[net.sourceforge.servestream]])
+and log in to rate and request tracks.
+.
+
+Repo Type:git
+Repo:https://github.com/OEP/rainwave-android.git
+
+Build:1.1,4
+    commit=36477326ec80e
+    init=sed -i 's/minSdkVersion="3"/minSdkVersion="4"/g' AndroidManifest.xml
+    target=android-8
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:4
+
diff --git a/metadata/com.sli.ohmcalc.txt b/metadata/com.sli.ohmcalc.txt
new file mode 100644
index 0000000000..6ecfaf394c
--- /dev/null
+++ b/metadata/com.sli.ohmcalc.txt
@@ -0,0 +1,25 @@
+Categories:Science & Education
+License:AGPL
+Web Site:
+Source Code:https://github.com/sli/ohmcalc
+Issue Tracker:https://github.com/sli/ohmcalc/issues
+
+Auto Name:Ohm Calc
+Summary:For e-cigarette users
+Description:
+Simple app that calculates total resistance of your coils and lets you apply Ohm’s law to also 
+find amp draw and power output.
+.
+
+Repo Type:git
+Repo:https://github.com/sli/ohmcalc.git
+
+Build:0.1,1
+    commit=0.1
+    srclibs=1:ActionBarSherlock@4.4.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
+
diff --git a/metadata/com.studio332.flickit.txt b/metadata/com.studio332.flickit.txt
index 20e1ceb872..0e98992dd0 100644
--- a/metadata/com.studio332.flickit.txt
+++ b/metadata/com.studio332.flickit.txt
@@ -10,7 +10,9 @@ Description:
 It combines aspects of shuffleboard, 9-ball and bumper pool into a unique new 
 gameplay experience. 
 Use your shooter puck to knock white targets into the holes for points. 
-Like 9-ball, the lowest numbered target must be hit first.
+In 9-ball, the lowest numbered target must be hit first, but it doesn't matter
+which target is holed.
+
 FlickIt! is easy to learn, yet difficult to master. 
 Just drag your finger to aim, tap and hold to increase power, and release to 
 shoot. 
@@ -21,13 +23,12 @@ Challenge your friends to see who is the true FlickIt! master.
 Repo Type:git
 Repo:https://github.com/louffoster/FlickIt.git
 
-Build:1.0.1,2
-    commit=13b9b
+Build:1.2,3
+    commit=59621a4ef5f9127
     subdir=FlickIt-android
-    init=zip -r native.zip libs/armeabi* libs/x86 && \
-        mv ../FlickIt/libs/gdx.jar libs/ && \
-        echo 'source.dir=src;../FlickIt/src' > ant.properties
-    build=unzip native.zip
+    init=mv ../FlickIt/libs/gdx.jar libs/ && \
+         echo 'source.dir=src;../FlickIt/src' > ant.properties
+    scanignore=FlickIt-android/libs/armeabi/libgdx.so;FlickIt-android/libs/x86/libgdx.so;FlickIt-android/libs/armeabi-v7a/libgdx.so
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/de.onyxbits.textfiction.txt b/metadata/de.onyxbits.textfiction.txt
new file mode 100644
index 0000000000..4ab903fad8
--- /dev/null
+++ b/metadata/de.onyxbits.textfiction.txt
@@ -0,0 +1,31 @@
+Categories:Games
+License:Apache2
+Web Site:http://www.onyxbits.de/textfiction
+Source Code:https://github.com/onyxbits/TextFiction
+Issue Tracker:https://github.com/onyxbits/TextFiction/issues
+
+Auto Name:Text Fiction
+Summary:Interactive fiction interpreter
+Description:
+ZPlet based Z-Machine interpreter for playing text-only adventures games. 
+The interface is like an SMS app
+and there's a list of buttons for common actions as well as the ability
+to select text from the page to be an action.
+
+Supports games in Z3, Z5, Z8 format and games can be download in the app.
+Savegames are kept on the sdcard.
+.
+
+Repo Type:git
+Repo:https://github.com/onyxbits/TextFiction.git
+
+Build:1.2,3
+    commit=v1.2
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.2
+Current Version Code:3
+
diff --git a/metadata/name.juodumas.ext_kbd_lithuanian.txt b/metadata/name.juodumas.ext_kbd_lithuanian.txt
new file mode 100644
index 0000000000..4c30fe1f06
--- /dev/null
+++ b/metadata/name.juodumas.ext_kbd_lithuanian.txt
@@ -0,0 +1,33 @@
+Categories:System
+License:Unlicense
+Web Site:
+Source Code:https://github.com/juodumas/android-lithuanian-layouts
+Issue Tracker:https://github.com/juodumas/android-lithuanian-layouts/issues
+
+Auto Name:Lithuanian Layouts - Ext. Keyboards
+Summary:Lithuanian for hardware keyboards
+Description:
+After installing the package, click on your hardware keyboard in 
+Android's input settings and choose one of the Lithuanian layouts.
+
+Summary in Lithuanian:
+Šis Android paketas prideda 2 lietuviškus klaviatūros išdėstymus išorinėms klaviatūroms:
+
+Lithuanian (numeric) - „skaičiukinė“ klaviatūra,
+Lithuanian (IBM LST 1205-92) - ĄŽERTY išdėstymas.
+Išbandyta su Android 4.1 ir 4.2 su USB ir Bluetooth klaviatūromis.
+.
+
+Repo Type:git
+Repo:https://github.com/juodumas/android-lithuanian-layouts.git
+
+Build:1.0,1
+    commit=34aa5
+    init=mkdir src
+    rm=built
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/net.lardcave.keepassnfc.txt b/metadata/net.lardcave.keepassnfc.txt
new file mode 100644
index 0000000000..caf5309e16
--- /dev/null
+++ b/metadata/net.lardcave.keepassnfc.txt
@@ -0,0 +1,23 @@
+Categories:System
+License:Unlicense/Apache2
+Web Site:http://code.lardcave.net/entries/2013/04/01/215058
+Source Code:https://github.com/nfd/KeePassNFC
+Issue Tracker:https://github.com/nfd/KeePassNFC/issues
+
+Auto Name:KeePass NFC
+Summary:Unlock database with tags
+Description:
+For use with [[com.android.keepass]].
+.
+
+Repo Type:git
+Repo:https://github.com/nfd/KeePassNFC.git
+
+Build:1.0,1
+    commit=661a6f7
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/net.pejici.summation.txt b/metadata/net.pejici.summation.txt
new file mode 100644
index 0000000000..02000e9f19
--- /dev/null
+++ b/metadata/net.pejici.summation.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:GPLv3
+Web Site:http://pejici.net/~slobo/projects/summation.html
+Source Code:https://github.com/pejic/Summation
+Issue Tracker:http://pejici.net/~slobo/contact.cgi
+
+Auto Name:Summation
+Summary:Add values from a list
+Description:
+Summation adds values from a list of items. 
+Each item has a label and a number and multiple lists are supported.
+.
+
+Repo Type:git
+Repo:https://github.com/pejic/Summation.git
+
+Build:0.1,1
+    commit=v0.1
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
+
diff --git a/metadata/org.logicallycreative.movingpolygons.txt b/metadata/org.logicallycreative.movingpolygons.txt
new file mode 100644
index 0000000000..48e61e5004
--- /dev/null
+++ b/metadata/org.logicallycreative.movingpolygons.txt
@@ -0,0 +1,23 @@
+Categories:Wallpaper
+License:GPLv3
+Web Site:
+Source Code:https://github.com/jagossel/MovingPolygons
+Issue Tracker:https://github.com/jagossel/MovingPolygons/issues
+
+Auto Name:Moving Polygons
+Summary:Bouncing lines live wallpaper
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/jagossel/MovingPolygons.git
+
+Build:1.0.0.3,4
+    commit=v1.0.0.3
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.0.3
+Current Version Code:4
+
diff --git a/metadata/org.quovadit.apps.andof.txt b/metadata/org.quovadit.apps.andof.txt
new file mode 100644
index 0000000000..2d984e62f0
--- /dev/null
+++ b/metadata/org.quovadit.apps.andof.txt
@@ -0,0 +1,24 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:http://andof.quovadit.org
+Source Code:http://sourceforge.net/projects/andof/support
+Issue Tracker:http://sourceforge.net/p/andof/code
+
+Auto Name:anDOF
+Summary:Calculate DOF for photography
+Description:
+Simple app to calculate depth of field
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/andof/code
+
+Build:1.3,9
+    commit=v1.3
+    target=android-17
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3
+Current Version Code:9
+
diff --git a/metadata/org.sudowars.txt b/metadata/org.sudowars.txt
index 33522a4e60..8a774d978f 100644
--- a/metadata/org.sudowars.txt
+++ b/metadata/org.sudowars.txt
@@ -16,7 +16,7 @@ In the trainings mode you can ask for assistance through the game.
 Repo Type:git
 Repo:https://github.com/sudowars/sudowars.git
 
-Build:1.1,5
+Build:1.1,2
     commit=v1.1
     subdir=Sudowars
     rm=screenshots
diff --git a/metadata/pl.nkg.geokrety.txt b/metadata/pl.nkg.geokrety.txt
new file mode 100644
index 0000000000..d4e0c9efc8
--- /dev/null
+++ b/metadata/pl.nkg.geokrety.txt
@@ -0,0 +1,36 @@
+Categories:Navigation
+License:GPLv3
+Web Site:http://geokrety.org
+Source Code:http://sourceforge.net/p/geokretylog/code
+Issue Tracker:http://forum.opencaching.pl/viewtopic.php?f=6&t=7789
+
+Auto Name:GeoKrety Logger
+Summary:Geocaching client
+Description:
+GeoKrety is a non-commercial GeoCaching game.
+People move registered objects (called GeoKrety) from cache to cache and 
+register each move with the service. 
+For more information please visit the website.
+You'll need account on the website to use the app.
+
+How to log GeoKret's movement:
+# Click the button "Log GeoKret" on the main screen.
+# Select the type of the log. Make sure that in the "Identify GeoKret" is your login.
+# If you had met or grabbed the GeoKret, fill in it's tracking code. If you drop the GeoKret, you can click "Inventory" and choose Tracking Code from the list of GeoKrets in your inventory.
+# If you had dropped or met GeoKret, you have to fill in the Waypoint. If you had logged to the cache before, click the button "OC Log" and select waypoint from the list (the date and time will be pasted too).
+# Set date and time, enter some comments and click "Go!".
+
+Status: Beta
+.
+
+Repo Type:git-svn
+Repo:svn://svn.code.sf.net/p/geokretylog/code;trunk=trunk;tags=tags
+
+Build:0.4.2 beta,12
+    commit=release-0.4.2-beta
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.4.2 beta
+Current Version Code:12
+
diff --git a/metadata/ru0xdc.rtkgps.txt b/metadata/ru0xdc.rtkgps.txt
index 1b27c35914..2a99f0b23a 100644
--- a/metadata/ru0xdc.rtkgps.txt
+++ b/metadata/ru0xdc.rtkgps.txt
@@ -1,6 +1,5 @@
 Categories:Navigation
-# MIT but see jni/simonlynen_android_libs/agast/jni/agast/include/agast/agast5_8.h
-License:GPLv3
+License:MIT
 Source Code:https://github.com/illarionov/RtkGps
 Issue Tracker:https://github.com/illarionov/RtkGps/issues
 
@@ -27,8 +26,15 @@ Build:1.0,1
     forceversion=yes
     init=sed -i 's/@/:\/\//g;s/:little/\/little/g;s/:illar/\/illar/g' .gitmodules && \
          git submodule update --init
+    scanignore=jni/simonlynen_android_libs/lapack/jni/clapack/INSTALL
     buildjni=yes
 
+Maintainer Notes:
+The scanner is tripped by binaries that are only used for testing; see the README.install.
+Could rm test* rather than scanignore but fdroid doesn't recover afterwards,
+since they're submodules
+.
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.0