diff --git a/metadata/org.kontalk.txt b/metadata/org.kontalk.txt
index 32136fb2d2..c97ae13da3 100644
--- a/metadata/org.kontalk.txt
+++ b/metadata/org.kontalk.txt
@@ -110,19 +110,23 @@ Build:3.0a6,32
 Build:3.0a7,33
     disable=Skip alpha
 
-Build:3.0a8,34
-    disable=wip for beta
+Build:3.0b1,34
+    disable=wip
     commit=f99f4530d424a78d339263100ca4660e0344ff26
     gradle=basic
     subdir=app
-    prebuild=sed -i -e "/googleplayCompile/d" build.gradle
-    submodules=yes
+    target=android-19
+    srclibs=KontalkCommon@7d3831bf487c225de9f2ef969708ddabb4973376,KontalkEmojicon@ea3026abfa4e680aac9217dcea9d2fc85a00eea2
+    prebuild=sed -i -e "/googleplayCompile/d" build.gradle && \
+        cp -fR $$KontalkCommon$$ client-common-java && \
+        cp -fR $$KontalkEmojicon$$ emojicon
 
 Maintainer Notes:
-3.x:
-* submodules are currently not set up, but cloned by running setup
+* submodules are currently not set up, but cloned by running ./setup -- for
+  now I use srclibs. upstream will tag corresponding releases in all repos
+  (beta1 should be "20140831") and will switch to submodules in b2/b3.
 * basic and googleplay flavors; both currently do not work
-* users sonatype
+* uses sonatype
 
 OLD: We have protobuf as srclib, why are we wgeting it via an insecure connection?
 .
diff --git a/srclibs/KontalkCommon.txt b/srclibs/KontalkCommon.txt
new file mode 100644
index 0000000000..8c040e6358
--- /dev/null
+++ b/srclibs/KontalkCommon.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/kontalk/client-common-java.git
diff --git a/srclibs/KontalkEmojicon.txt b/srclibs/KontalkEmojicon.txt
new file mode 100644
index 0000000000..6994b81348
--- /dev/null
+++ b/srclibs/KontalkEmojicon.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/kontalk/emojicon.git