diff --git a/CHANGES b/CHANGES
index b2d4080e9..f77c035bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,8 @@ Misc:
  - Qt: Remove use of NaN
  - FFmpeg: Update dependencies on Ubuntu
  - All: Allow use of external minizip library
+ - GBA Video: Null renderer should return proper register values
+ - Libretro: Disable logging game errors, BIOS calls and stubs in release builds
 
 0.4.0: (2016-02-02)
 Features:
diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c
index c4850cbbd..64f404b3c 100644
--- a/src/platform/libretro/libretro.c
+++ b/src/platform/libretro/libretro.c
@@ -451,13 +451,19 @@ void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* f
 		break;
 	case GBA_LOG_INFO:
 	case GBA_LOG_GAME_ERROR:
-	case GBA_LOG_SWI:
 	case GBA_LOG_STATUS:
 		retroLevel = RETRO_LOG_INFO;
 		break;
-	case GBA_LOG_DEBUG:
+	case GBA_LOG_SWI:
 	case GBA_LOG_STUB:
 	case GBA_LOG_SIO:
+#ifdef NDEBUG
+		return;
+#else
+		retroLevel = RETRO_LOG_DEBUG;
+		break;
+#endif
+	case GBA_LOG_DEBUG:
 		retroLevel = RETRO_LOG_DEBUG;
 		break;
 	}