diff --git a/CMakeLists.txt b/CMakeLists.txt
index 315830ab76..6120c3ee9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -634,7 +634,8 @@ if(USE_FFMPEG AND NOT BUILD_BUNDLED_FFMPEG)
 	# Check if we need to use av_frame_get_buffer instead of avcodec_default_get_buffer
 endif()
 
-find_package(ZLIB)
+# 1.2.9 for uncompress2 (Core/Util/PSARUnpack.cpp). Older system zlibs (Ubuntu 16.04's) get the bundled one.
+find_package(ZLIB 1.2.9)
 if(ZLIB_FOUND AND NOT ANDROID)
 	include_directories(${ZLIB_INCLUDE_DIR})
 	add_compile_definitions(SHARED_ZLIB)
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index fd3c863124..b6f3fa5c76 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -9,6 +9,16 @@
 #include <cstdlib>
 #include <mutex>
 
+// Puts the exact compiler version in the build log, to see what libretro's buildbot runs. Clang reports
+// this pragma as a warning, so only MSVC and GCC.
+#define LIBRETRO_STRINGIFY2(x) #x
+#define LIBRETRO_STRINGIFY(x) LIBRETRO_STRINGIFY2(x)
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma message("Compiler: MSVC " LIBRETRO_STRINGIFY(_MSC_FULL_VER) ", _MSVC_LANG " LIBRETRO_STRINGIFY(_MSVC_LANG))
+#elif defined(__GNUC__) && !defined(__clang__)
+#pragma message("Compiler: GCC " __VERSION__ ", __cplusplus " LIBRETRO_STRINGIFY(__cplusplus))
+#endif
+
 #include "Common/CPUDetect.h"
 #include "Common/Log.h"
 #include "Common/Log/LogManager.h"