diff --git a/metadata/com.eolwral.osmonitor.txt b/metadata/com.eolwral.osmonitor.txt
index 6a2851540f..263a0b13f2 100644
--- a/metadata/com.eolwral.osmonitor.txt
+++ b/metadata/com.eolwral.osmonitor.txt
@@ -159,20 +159,23 @@ Build:3.3.0.5,69
         mv libs/x86/osmcore assets/osmcore_x86
 
 Build:3.3.1.1,71
-    disable=WIP, dex issues while building
     commit=2c025bfbe7e9624849ecc5aefac0fe20363f2e8c
     subdir=OSMonitor
-    srclibs=1:Support/v7/appcompat@android-5.0.2_r1,2:Volley@android-5.0.2_r1,3:ColorPicker-eolwral@788621da0c
-    prebuild=cp $$SDK$$/extras/android/support/v4/android-support-v4.jar $$Support$$/libs/ && \
-    echo -e 'java.source=1.7\njava.target=1.7' > $$Support$$/ant.properties && \
-    cp $$SDK$$/extras/android/support/annotations/android-support-annotations.jar $$Support$$/libs/
-    buildjni=yes
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-5.0.1_r1,2:Volley@android-5.0.1_r1,3:ColorPicker-eolwral@788621da0c
+    rm=OSMonitor/jni/src/google/protobuf/testdata/golden*
+    prebuild=mv libs/android-support-v4.jar $$Support$$/libs/ && \
+        echo -e 'java.source=1.7\njava.target=1.7' > $$Support$$/ant.properties && \
+        mv jni jni_
     target=android-21
+    build=mv jni_ jni && \
+        $$NDK$$/ndk-build && \
+        mkdir -p assets && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/mips/osmcore assets/osmcore_mips && \
+        mv libs/x86/osmcore assets/osmcore_x86
 
 Maintainer Notes:
-Could support additional CPU architectures and lose the scanignore by building
-the stuff in /jni and moving the three outputs to /assets.
-
 Once jni builds properly and there is a new release out, do:
 
 Build:3.0.9.3,57