diff --git a/include/libtorrent/aux_/disable_warnings_push.hpp b/include/libtorrent/aux_/disable_warnings_push.hpp
index e013a2071..1811434c9 100644
--- a/include/libtorrent/aux_/disable_warnings_push.hpp
+++ b/include/libtorrent/aux_/disable_warnings_push.hpp
@@ -44,6 +44,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wpedantic"
+#if __GNUC__ >= 6
+#pragma GCC diagnostic ignored "-Wshift-overflow"
+#pragma GCC diagnostic ignored "-Wshift-count-overflow"
+#pragma GCC diagnostic ignored "-Wshift-count-negative"
+#endif
 #endif
 
 #ifdef __clang__
diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp
index 779d4d242..f03b8b877 100644
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <functional>
 
 #include "libtorrent/aux_/disable_warnings_push.hpp"
+
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/multiprecision/integer.hpp>