diff --git a/configure.ac b/configure.ac
index 1e906a8..fb3d62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,6 @@
     [],
     [AC_MSG_ERROR([Could not find libipmid...openbmc/phosphor-host-ipmid package required])]
 )
-AC_CHECK_HEADER(
-    experimental/filesystem,
-    [],
-    [AC_MSG_ERROR([Could not find experimental/filesystem...libstdc++fs developement package required])]
-)
 AX_PTHREAD([], [AC_MSG_ERROR(["pthread required and not found"])])
 
 # Make it possible for users to choose if they want test support
diff --git a/fs.cpp b/fs.cpp
index 0c20d83..244fb8b 100644
--- a/fs.cpp
+++ b/fs.cpp
@@ -16,13 +16,13 @@
 
 #include "fs.hpp"
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <string>
 #include <vector>
 
 namespace blobs
 {
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 std::vector<std::string> getLibraryList(const std::string& path,
                                         PathMatcher check)
diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp
index b986bd8..6b89f6a 100644
--- a/test/utils_unittest.cpp
+++ b/test/utils_unittest.cpp
@@ -4,14 +4,14 @@
 #include "manager_mock.hpp"
 #include "utils.hpp"
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <gtest/gtest.h>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace blobs
 {