diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index b074b047b..35da94ed5 100644
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -39,6 +39,17 @@
 #endif
 #endif
 
+/* Workaround for the broken signature of alphasort() in bionic.
+   This was fixed upstream in 40e467ec668b59be25491bd44bf348a884d6a68d so the
+   workaround can probably be dropped with the next version of the Android NDK.
+ */
+#ifdef IS_BIONIC
+int bionic_alphasort(const struct dirent** a, const struct dirent** b) {
+       return strcoll((*a)->d_name, (*b)->d_name);
+}
+#endif
+
+
 lxc_log_define(lxc_parse, lxc);
 
 static int dir_filter(const struct dirent *dirent)
@@ -55,7 +66,11 @@ int lxc_dir_for_each(const char *name, const char *directory,
 	struct dirent **namelist;
 	int n, ret = 0;
 
+#ifdef IS_BIONIC
+	n = scandir(directory, &namelist, dir_filter, bionic_alphasort);
+#else
 	n = scandir(directory, &namelist, dir_filter, alphasort);
+#endif
 	if (n < 0) {
 		SYSERROR("failed to scan %s directory", directory);
 		return -1;