diff --git a/metadata/app.openconnect.txt b/metadata/app.openconnect.txt
index 77e6cd5432..e7c8e61fef 100644
--- a/metadata/app.openconnect.txt
+++ b/metadata/app.openconnect.txt
@@ -113,6 +113,7 @@ Build:1.02,1029
 Build:1.11,1119
     commit=v1.11
     submodules=yes
+    patch=stoken-java-7.diff,no-textrel-gmp.diff
     srclibs=ACRA@acra-4.5.0
     rm=libs/*
     prebuild=pushd $$ACRA$$ && \
@@ -120,7 +121,9 @@ Build:1.11,1119
         popd && \
         cp $$ACRA$$/target/acra-4.5.0.jar libs/ && \
         make -C external/openconnect/android sources
+    scandelete=external/openconnect/android/sources/gnutls-3.2.21/doc/credentials
     build=make -C external NDK=$$NDK$$
+    ndk=r10e
 
 Maintainer Notes:
 TODO: libs/openconnect-wrapper.jar
diff --git a/metadata/app.openconnect/no-textrel-gmp.diff b/metadata/app.openconnect/no-textrel-gmp.diff
new file mode 100644
index 0000000000..4c3a9eebc9
--- /dev/null
+++ b/metadata/app.openconnect/no-textrel-gmp.diff
@@ -0,0 +1,12 @@
+diff --git a/external/openconnect/android/Makefile b/external/openconnect/android/Makefile
+--- a/external/openconnect/android/Makefile
++++ b/external/openconnect/android/Makefile
+@@ -51,7 +51,7 @@ FETCH=$(TOPDIR)/fetch.sh
+ 
+ CONFIGURE_ARGS := --host=$(TRIPLET) --prefix=$(OC_SYSROOT) \
+ 		  --disable-shared --enable-static \
+-		  CFLAGS="$(EXTRA_CFLAGS)"
++		  --disable-assembly CFLAGS="$(EXTRA_CFLAGS)"
+ 
+ SOURCE_LIST = $(LIBXML2_SRC)/configure $(GMP_SRC)/configure \
+ 	$(NETTLE_SRC)/configure $(GNUTLS_SRC)/configure \
diff --git a/metadata/app.openconnect/stoken-java-7.diff b/metadata/app.openconnect/stoken-java-7.diff
new file mode 100644
index 0000000000..071ea6aee0
--- /dev/null
+++ b/metadata/app.openconnect/stoken-java-7.diff
@@ -0,0 +1,13 @@
+diff --git a/external/stoken/java/build.xml b/external/stoken/java/build.xml
+index ded2a76..5f821bb 100644
+--- a/external/stoken/java/build.xml
++++ b/external/stoken/java/build.xml
+@@ -5,6 +5,8 @@
+ 
+ 	<property name="jar_lib" location="${dist}/stoken-wrapper.jar"/>
+ 	<property name="jar_app" location="${dist}/example.jar"/>
++	<property name="ant.build.javac.source" value="1.7"/>
++	<property name="ant.build.javac.target" value="1.7"/>
+ 
+ 	<target name="init">
+ 		<mkdir dir="${build}"/>