diff --git a/library/system/CMakeLists.txt b/library/system/CMakeLists.txt
index cf1199e00..3361d0b46 100644
--- a/library/system/CMakeLists.txt
+++ b/library/system/CMakeLists.txt
@@ -24,6 +24,9 @@ if (HAVE_LIBCRYPT)
 endif (HAVE_LIBCRYPT)
 
 target_link_libraries(sys libYap)
+if (ANDROID)
+target_link_libraries(sys android gmp)
+endif()
 
 set_target_properties (sys PROPERTIES  PREFIX "")
 
diff --git a/library/system/sys.c b/library/system/sys.c
index f0fa979fd..a4446bae4 100644
--- a/library/system/sys.c
+++ b/library/system/sys.c
@@ -304,9 +304,9 @@ list_directory(void)
 #else
 #if __ANDROID__
  {
-    extern AAssetManager *assetManager;
+    extern AAssetManager *Yap_assetManager;
      const char *dirName = buf+strlen("/assets/");
-     AAssetManager* mgr = assetManager;
+     AAssetManager* mgr = Yap_assetManager;
     AAssetDir	 *de;
     const char* dp;