diff --git a/frontend/frontend.c b/frontend/frontend.c
index 71aeabdbce..4efc353561 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -98,13 +98,24 @@ static void rarch_get_environment_console(void)
 }
 #endif
 
-#if defined(IOS) || defined(OSX) || defined(HAVE_BB10)
+#if defined(ANDROID)
+#define main_entry android_app_entry
+#define returntype void*
+#define signature() void* data
+#define returnfunc() exit(0)
+#elif defined(IOS) || defined(OSX) || defined(HAVE_BB10)
 #define main_entry rarch_main
+#define returntype int
+#define signature() int argc, char *argv[]
+#define returnfunc() return 0
 #else
 #define main_entry main
+#define returntype int
+#define signature() int argc, char *argv[]
+#define returnfunc() return 0
 #endif
 
-int main_entry(int argc, char *argv[])
+returntype main_entry(signature())
 {
    void* args = NULL;
    frontend_ctx = (frontend_ctx_driver_t*)frontend_ctx_init_first();
@@ -284,5 +295,5 @@ int main_entry(int argc, char *argv[])
    if (frontend_ctx && frontend_ctx->shutdown)
       frontend_ctx->shutdown(false);
 
-   return 0;
+   returnfunc();
 }
diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c
index 6d578b3691..4614b20120 100644
--- a/frontend/frontend_android.c
+++ b/frontend/frontend_android.c
@@ -294,7 +294,7 @@ exit:
 
    // exit() here is nasty.
    // pthread_exit(NULL) or return NULL; causes hanging ...
-   // Should probably called ANativeActivity_finsih(), but it's bugged, it will hang our app.
+   // Should probably call ANativeActivity_finish(), but it's bugged, it will hang our app.
    exit(0);
 }