diff --git a/console/logger/logger_override.h b/console/logger/logger_override.h
index 66a5509e91..e6a6cb7af5 100644
--- a/console/logger/logger_override.h
+++ b/console/logger/logger_override.h
@@ -58,71 +58,4 @@
 
 #endif
 
-#elif defined(HAVE_FILE_LOGGER)
-extern FILE * log_fp;
-
-#ifdef IS_SALAMANDER
-
-#ifndef RARCH_LOG
-#define RARCH_LOG(...) do { \
-      fprintf(log_fp, "RetroArch Salamander: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_ERR
-#define RARCH_ERR(...) do { \
-      fprintf(log_fp, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_WARN
-#define RARCH_WARN(...) do { \
-      fprintf(log_fp, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_LOG_OUTPUT
-#define RARCH_LOG_OUTPUT(...) do { \
-      fprintf(log_fp, "RetroArch Salamander [OUTPUT] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#else
-
-#ifndef RARCH_LOG
-#define RARCH_LOG(...) do { \
-      fprintf(log_fp, "RetroArch: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_ERR
-#define RARCH_ERR(...) do { \
-      fprintf(log_fp, "RetroArch [ERROR] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_WARN
-#define RARCH_WARN(...) do { \
-      fprintf(log_fp, "RetroArch [WARN] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#ifndef RARCH_LOG_OUTPUT
-#define RARCH_LOG_OUTPUT(...) do { \
-      fprintf(log_fp, "RetroArch [OUTPUT] :: " __VA_ARGS__); \
-      fflush(log_fp); \
-   } while (0)
-#endif
-
-#endif
-
-#endif
-
 #endif
diff --git a/general.h b/general.h
index 0c4f5908aa..199b40d33b 100644
--- a/general.h
+++ b/general.h
@@ -283,6 +283,10 @@ struct global
    char config_path[PATH_MAX];
    char append_config_path[PATH_MAX];
 #endif
+
+#ifdef HAVE_FILE_LOGGER
+   char default_log_file[PATH_MAX];
+#endif
    
    char basename[PATH_MAX];
    char fullpath[PATH_MAX];
diff --git a/gx/frontend/main.c b/gx/frontend/main.c
index bfbcdf4b90..9698edca96 100644
--- a/gx/frontend/main.c
+++ b/gx/frontend/main.c
@@ -54,10 +54,6 @@
 #include <sdcard/gcsd.h>
 #include <fat.h>
 
-#ifdef HAVE_FILE_LOGGER
-FILE * log_fp;
-#endif
-
 enum
 {
    GX_DEVICE_SD = 0,
diff --git a/retroarch.c b/retroarch.c
index 4eb8b6d8f3..6ec8c504ce 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -56,6 +56,10 @@
 #define RARCH_PERFORMANCE_MODE
 #endif
 
+#ifdef HAVE_FILE_LOGGER
+FILE *log_fp;
+#endif
+
 // To avoid continous switching if we hold the button down, we require that the button must go from pressed, unpressed back to pressed to be able to toggle between then.
 static void set_fast_forward_button(bool new_button_state, bool new_hold_button_state)
 {
@@ -2551,6 +2555,11 @@ static void init_state(void)
    g_extern.video_active = true;
    g_extern.audio_active = true;
    g_extern.game_type = RARCH_CART_NORMAL;
+
+#if defined(HAVE_FILE_LOGGER) && !defined(RARCH_CONSOLE)
+   snprintf(g_extern.default_log_file, sizeof(g_extern.default_log_file), "/retroarch-log.txt");
+   log_fp = fopen(g_extern.default_log_file, "w");
+#endif
 }
 
 void rarch_main_clear_state(void)
@@ -2864,6 +2873,10 @@ int rarch_main(int argc, char *argv[])
 #endif
 
    rarch_main_clear_state();
+
+#if defined(HAVE_FILE_LOGGER) && !defined(RARCH_CONSOLE)
+   fclose(log_fp);
+#endif
    return 0;
 }
 
diff --git a/retroarch_logger.h b/retroarch_logger.h
index 6b31963b70..0b121cfd02 100644
--- a/retroarch_logger.h
+++ b/retroarch_logger.h
@@ -21,7 +21,14 @@
 #include <android/log.h>
 #endif
 
-#if defined(RARCH_CONSOLE) && (defined(HAVE_LOGGER) || defined(HAVE_FILE_LOGGER) || defined(_XBOX1))
+#ifdef HAVE_FILE_LOGGER
+extern FILE * log_fp;
+#define STDERR_OUT (log_fp)
+#else
+#define STDERR_OUT (stderr)
+#endif
+
+#if defined(RARCH_CONSOLE) && (defined(HAVE_LOGGER) || defined(_XBOX1))
 #include <logger_override.h>
 #else
 
@@ -30,15 +37,15 @@
 #define  RARCH_LOG(...)  __android_log_print(ANDROID_LOG_INFO,"RetroArch: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_LOG(...) do { \
-      fprintf(stderr, "RetroArch Salamander: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "RetroArch Salamander: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_LOG(...) do { \
       if (g_extern.verbose) \
       { \
-         fprintf(stderr, "RetroArch: " __VA_ARGS__); \
-         fflush(stderr); \
+         fprintf(STDERR_OUT, "RetroArch: " __VA_ARGS__); \
+         fflush(STDERR_OUT); \
       } \
    } while (0)
 #endif
@@ -49,15 +56,15 @@
 #define  RARCH_LOG_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO,"stderr: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_LOG_OUTPUT(...) do { \
-      fprintf(stderr, "stderr: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "stderr: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_LOG_OUTPUT(...) do { \
       if (g_extern.verbose) \
       { \
-         fprintf(stderr, __VA_ARGS__); \
-         fflush(stderr); \
+         fprintf(STDERR_OUT, __VA_ARGS__); \
+         fflush(STDERR_OUT); \
       } \
    } while (0)
 #endif
@@ -68,13 +75,13 @@
 #define  RARCH_ERR(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_ERR(...) do { \
-      fprintf(stderr, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_ERR(...) do { \
-      fprintf(stderr, "RetroArch [ERROR] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "RetroArch [ERROR] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #endif
 #endif
@@ -84,13 +91,13 @@
 #define  RARCH_ERR_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO, "stderr [ERROR] :: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_ERR_OUTPUT(...) do { \
-      fprintf(stderr, "stderr [ERROR] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "stderr [ERROR] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_ERR_OUTPUT(...) do { \
-      fprintf(stderr, "stderr [ERROR] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "stderr [ERROR] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #endif
 #endif
@@ -100,13 +107,13 @@
 #define  RARCH_WARN(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_WARN(...) do { \
-      fprintf(stderr, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_WARN(...) do { \
-      fprintf(stderr, "RetroArch [WARN] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "RetroArch [WARN] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #endif
 #endif
@@ -116,13 +123,13 @@
 #define  RARCH_WARN_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO, "stderr [WARN] :: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_WARN_OUTPUT(...) do { \
-      fprintf(stderr, "stderr [WARN] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "stderr [WARN] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #else
 #define RARCH_WARN_OUTPUT(...) do { \
-      fprintf(stderr, "stderr [WARN] :: " __VA_ARGS__); \
-      fflush(stderr); \
+      fprintf(STDERR_OUT, "stderr [WARN] :: " __VA_ARGS__); \
+      fflush(STDERR_OUT); \
    } while (0)
 #endif
 #endif