diff --git a/include/superior_mysqlpp/uncaught_exception_counter.hpp b/include/superior_mysqlpp/uncaught_exception_counter.hpp
index b02555a1..db0da968 100644
--- a/include/superior_mysqlpp/uncaught_exception_counter.hpp
+++ b/include/superior_mysqlpp/uncaught_exception_counter.hpp
@@ -10,11 +10,15 @@ namespace SuperiorMySqlpp
 {
     inline int uncaughtExceptions() noexcept
     {
+#if defined(__clang__) && _LIBCPPABI_VERSION >= 1002
+        return static_cast<int>(__cxxabiv1::__cxa_uncaught_exceptions());
+#else
         auto* globalsPtr = __cxxabiv1::__cxa_get_globals();
         auto* globalsEreasedPtr = reinterpret_cast<char*>(globalsPtr);
         auto* uncaughtExceptionsErasedPtr = globalsEreasedPtr + sizeof(void*);
         auto* uncaughtExceptionsPtr = reinterpret_cast<int*>(uncaughtExceptionsErasedPtr);
         return *uncaughtExceptionsPtr;
+#endif
     }
 
     class UncaughtExceptionCounter
diff --git a/packages/_debian-common/changelog b/packages/_debian-common/changelog
index aab014e0..d260a3e2 100755
--- a/packages/_debian-common/changelog
+++ b/packages/_debian-common/changelog
@@ -1,8 +1,12 @@
 libsuperiormysqlpp (0.4.1) UNRELEASED; urgency=medium
 
+  [ Peter Opatril ]
   * refactor: Logging system (DRY)
   * feat: Default logger logs errors
 
+  [ Adam Stepan ]
+  * Fix compilation with libc++
+
  -- Peter Opatril <petr.opatril@firma.seznam.cz>  Fri, 24 May 2019 14:07:13 +0000
 
 libsuperiormysqlpp (0.4.0) unstable; urgency=medium