diff --git a/jni/Android.mk b/jni/Android.mk
index 6edb1c8..fea25e8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -18,6 +18,7 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/common-session.c \
 	$(DROPBEAR_PATH)/compat.c \
 	$(DROPBEAR_PATH)/crypto_desc.c \
+	$(DROPBEAR_PATH)/curve25519.c \
 	$(DROPBEAR_PATH)/dbhelpers.c \
 	$(DROPBEAR_PATH)/dbmalloc.c \
 	$(DROPBEAR_PATH)/dbrandom.c \
@@ -324,6 +325,7 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/libtomcrypt/src/prngs/sober128.c \
 	$(DROPBEAR_PATH)/libtomcrypt/src/prngs/sprng.c \
 	$(DROPBEAR_PATH)/libtomcrypt/src/prngs/yarrow.c \
+	$(DROPBEAR_PATH)/libtommath/bn_cutoffs.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_2expt.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_abs.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_add.c \
@@ -351,16 +353,23 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_exptmod.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_exteuclid.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_fread.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_from_ubin.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_fwrite.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_gcd.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_get_i32.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_get_l.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_get_mag_u32.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_get_mag_ul.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_grow.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_init.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_init_u32.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_init_copy.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_init_multi.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_init_set.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_init_size.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_invmod.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_is_square.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_kronecker.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_lcm.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_lshd.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_mod.c \
@@ -381,6 +390,7 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_prime_miller_rabin.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_prime_next_prime.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_prime_rabin_miller_trials.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_prime_strong_lucas_selfridge.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_radix_size.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_radix_smap.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_rand.c \
@@ -395,6 +405,9 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_reduce_setup.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_rshd.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_set.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_set_i32.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_set_u32.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_set_ul.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_shrink.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_sqr.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_sqrmod.c \
@@ -402,14 +415,28 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_sub.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_sub_d.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_submod.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_to_radix.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_to_ubin.c \
+	$(DROPBEAR_PATH)/libtommath/bn_mp_ubin_size.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_xor.c \
 	$(DROPBEAR_PATH)/libtommath/bn_mp_zero.c \
 	$(DROPBEAR_PATH)/libtommath/bn_prime_tab.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_add.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_balance_mul.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_exptmod.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_exptmod_fast.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_get_bit.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_invmod_fast.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_invmod_slow.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_montgomery_reduce_fast.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_mul_digs.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_mul_digs_fast.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_mul_high_digs.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_mul_high_digs_fast.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_prime_is_divisible.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_reverse.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_sqr.c \
+	$(DROPBEAR_PATH)/libtommath/bn_s_mp_sqr_fast.c \
 	$(DROPBEAR_PATH)/libtommath/bn_s_mp_sub.c \
 	$(DROPBEAR_PATH)/list.c \
 	$(DROPBEAR_PATH)/listener.c \