diff --git a/.travis.yml b/.travis.yml
index 551310a..6d76335 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 language: cpp
 compiler:
   - gcc
diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt
index 97eb204..0aace64 100644
--- a/Minetestmapper/CMakeLists.txt
+++ b/Minetestmapper/CMakeLists.txt
@@ -80,11 +80,10 @@ target_include_directories(Minetestmapper PRIVATE ${LIBGD_INCLUDE_DIR})
 if(UNIX)
 	find_package(PNG REQUIRED)
 	find_package(Threads REQUIRED)
-	find_library(fs_LIBRARY NAMES stdc++fs)
-	if(fs_LIBRARY)
-		target_link_libraries(Minetestmapper fs_LIBRARY)
-	endif()
+
 	target_link_libraries(Minetestmapper PNG::PNG Threads::Threads ${CMAKE_DL_LIBS})
+
+	target_link_libraries(Minetestmapper $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
 endif()
 
 # Optional Libraries