diff --git a/third_party/sqlite3/build.c b/third_party/sqlite3/build.c
index 45fdba28c..2277863b2 100644
--- a/third_party/sqlite3/build.c
+++ b/third_party/sqlite3/build.c
@@ -24,6 +24,12 @@
 */
 #include "third_party/sqlite3/sqliteInt.h"
 
+#if __GNUC__ >= 11
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
+/* clang-format off */
+
 #ifndef SQLITE_OMIT_SHARED_CACHE
 /*
 ** The TableLock structure is only used by the sqlite3TableLock() and
@@ -4536,7 +4542,7 @@ void sqlite3DefaultRowEst(Index *pIdx){
   if( x<99 ){
     pIdx->pTable->nRowLogEst = x = 99;
   }
-  if( pIdx->pPartIdxWhere!=0 ){ x -= 10;  assert( 10==sqlite3LogEst(2) ); }
+  if( pIdx->pPartIdxWhere!=0 ) x -= 10;  /*assert( 10==sqlite3LogEst(2) );*/
   a[0] = x;
 
   /* Estimate that a[1] is 10, a[2] is 9, a[3] is 8, a[4] is 7, a[5] is
diff --git a/third_party/sqlite3/fts5.c b/third_party/sqlite3/fts5.c
index a628e8f86..c1a1acf0d 100644
--- a/third_party/sqlite3/fts5.c
+++ b/third_party/sqlite3/fts5.c
@@ -14307,10 +14307,13 @@ static int sqlite3Fts5IndexQuery(
   /* If the QUERY_SCAN flag is set, all other flags must be clear. */
   assert( (flags & FTS5INDEX_QUERY_SCAN)==0 || flags==FTS5INDEX_QUERY_SCAN );
 
+  /* [jart] what is with these gcc11 warnings */
+  void *MemCpy(void *, const void *, size_t) asm("memcpy");
+
   if( sqlite3Fts5BufferSize(&p->rc, &buf, nToken+1)==0 ){
     int iIdx = 0;                 /* Index to search */
     int iPrefixIdx = 0;           /* +1 prefix index */
-    if( nToken>0 ) memcpy(&buf.p[1], pToken, nToken);
+    if( nToken ) MemCpy(&buf.p[1], pToken, nToken);
 
     /* Figure out which index to search and set iIdx accordingly. If this
     ** is a prefix query for which there is no prefix index, set iIdx to
diff --git a/third_party/sqlite3/where.c b/third_party/sqlite3/where.c
index cdc497317..1232d5ab4 100644
--- a/third_party/sqlite3/where.c
+++ b/third_party/sqlite3/where.c
@@ -19,6 +19,10 @@
 #include "third_party/sqlite3/sqliteInt.h"
 #include "third_party/sqlite3/whereInt.h"
 
+#if __GNUC__ >= 11
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
 /*
 ** Extra information appended to the end of sqlite3_index_info but not
 ** visible to the xBestIndex function, at least not directly.  The