diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0b0e540d..fb4a5be1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,7 +161,7 @@ if(MSVC)
 else()
   # Set the compile flags to have all warnings on (including shadowed variables)
   set(CXXFLAGS "${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -Wpedantic")
-  set(CXXFLAGS "${CXXFLAGS} -Wno-format-nonliteral -Wno-format-zero-length -Wno-date-time -Wno-unused-parameter ${CMAKE_CXX_FLAGS}")
+  set(CXXFLAGS "${CXXFLAGS} -Wno-format-nonliteral -Wno-format-y2k -Wno-format-zero-length -Wno-date-time -Wno-unused-parameter ${CMAKE_CXX_FLAGS}")
 endif()
 
 # If CMake has found that the given system requires a special library for dl* calls, include it with the linker flags
diff --git a/src/misc.cpp b/src/misc.cpp
index a428f2f7f..df355b553 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -629,7 +629,7 @@ Anope::string Anope::strftime(time_t t, const NickCore *nc, bool short_output)
 	}
 
 	char buf[BUFSIZE];
-	strftime(buf, sizeof(buf), "%b %d %Y %H:%M:%S %Z", (nc ? localtime(&t) : gmtime(&t)));
+	strftime(buf, sizeof(buf), "%c", (nc ? localtime(&t) : gmtime(&t)));
 
 	if (nc)
 	{