diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 32db17d3..7b2aa087 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -202,7 +202,7 @@ def read_config(opts, config_file='config.py'):
 
 def get_ndk_path(version):
     if version is None:
-        version = 'r10e'  # latest
+        version = 'r10e'  # falls back to latest
     paths = config['ndk_paths']
     if version not in paths:
         return ''
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index db843569..09a5d07f 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -103,7 +103,7 @@ flag_defaults = OrderedDict([
     ('scandelete', []),
     ('build', ''),
     ('buildjni', []),
-    ('ndk', 'r9b'),  # defaults to oldest
+    ('ndk', 'r10e'),  # defaults to latest
     ('preassemble', []),
     ('antcommands', None),
     ('novcheck', False),