diff --git a/build/extlib/LanguagePacks/es-smaller.xml.gz b/build/extlib/LanguagePacks/es-smaller.xml.gz
new file mode 100644
index 0000000000..a97038e4ea
Binary files /dev/null and b/build/extlib/LanguagePacks/es-smaller.xml.gz differ
diff --git a/metadata/com.anysoftkeyboard.languagepack.spain.txt b/metadata/com.anysoftkeyboard.languagepack.spain.txt
index 67ee8f6069..1e956f4ed5 100644
--- a/metadata/com.anysoftkeyboard.languagepack.spain.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.spain.txt
@@ -10,8 +10,8 @@ Summary:Language pack for AnySoftKeyboard
 Description:
 Dictionary is based on the Wikipedia article database
 which can be distributed under the terms of either the GNU Free Documentation
-or the Creative Commons Attribution-ShareAlike licenses and
-has about 200,000 words.
+or the Creative Commons Attribution-ShareAlike licenses. 
+It has about 200,000 words and the smaller version has 80,000.
 
 Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
@@ -20,6 +20,12 @@ the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 Repo Type:svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
 
+Build Version:20110717-smaller,2,1813,forceversion=yes,forcevercode=yes,\
+patch=xml.patch;dump.patch,extlibs=LanguagePacks/es-smaller.xml.gz,\
+srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496,prebuild=\
+sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+mkdir -p dict/ res/raw/ && gunzip -c libs/es-smaller.xml.gz > dict/words.xml && \
+rm -rf assets/,build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 Build Version:20110717,3,1813,\
 patch=xml.patch;dump.patch,extlibs=LanguagePacks/es.xml.gz,\
 srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496,prebuild=\
diff --git a/metadata/org.subsurface.txt b/metadata/org.subsurface.txt
new file mode 100644
index 0000000000..3375f50f32
--- /dev/null
+++ b/metadata/org.subsurface.txt
@@ -0,0 +1,25 @@
+Category:Science & Education
+License:GPL
+Web Site:http://subsurface.hohndel.org
+Source Code:http://git.hohndel.org/index.cgi?p=subsurface.git;a=summary
+Issue Tracker:http://trac.hohndel.org/report/1
+
+Summary:Dive logger
+Description:
+Companion app for the cross-platform Subsurface desktop app
+
+* Capture dive positions
+* Search and modify old dives
+* Synchronise dives with a server for manipulation in desktop app
+.
+
+Repo Type:git
+Repo:git://subsurface.hohndel.org/subsurface-companion.git
+
+Build Version:1.6,4,1.6,maven=yes,prebuild=sed -i '/sherlock/d' project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.6
+Current Version Code:7
+