diff --git a/raylib/core.c b/raylib/core.c
index 32eaa70..1e6fdf5 100644
--- a/raylib/core.c
+++ b/raylib/core.c
@@ -556,8 +556,9 @@ void android_main(struct android_app *app)
     char arg0[] = "raylib";     // NOTE: argv[] are mutable
     CORE.Android.app = app;
 
+    (void)android_run();
     // TODO: Should we maybe report != 0 return codes somewhere?
-    (void)main(1, (char *[]) { arg0, NULL });
+    //(void)main(1, (char *[]) { arg0, NULL });
 }
 
 // TODO: Add this to header (if apps really need it)
diff --git a/raylib/raudio.c b/raylib/raudio.c
index a0f4b7c..abc63b7 100644
--- a/raylib/raudio.c
+++ b/raylib/raudio.c
@@ -1,3 +1,5 @@
+// +build !noaudio
+
 /**********************************************************************************************
 *
 *   raudio - A simple and easy-to-use audio library based on miniaudio