diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt
index 62e4d18750..0cc4f417c1 100644
--- a/ports/libsodium/CMakeLists.txt
+++ b/ports/libsodium/CMakeLists.txt
@@ -152,24 +152,24 @@ else ()
             -Wbad-function-cast
             -Wcast-qual
             #-Wdiv-by-zero
-            -Wduplicated-branches
-            -Wduplicated-cond
+            #-Wduplicated-branches
+            #-Wduplicated-cond
             -Wfloat-equal
             -Wformat=2
             -Wlogical-op
             -Wmaybe-uninitialized
-            -Wmisleading-indentation
+            #-Wmisleading-indentation
             -Wmissing-declarations
             -Wmissing-prototypes
             -Wnested-externs
             #-Wno-type-limits
             #-Wno-unknown-pragmas
             -Wnormalized=id
-            -Wnull-dereference
+            #-Wnull-dereference
             -Wold-style-declaration
             -Wpointer-arith
             -Wredundant-decls
-            -Wrestrict
+            #-Wrestrict
             #-Wsometimes-uninitialized
             -Wstrict-prototypes
             -Wswitch-enum
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
index 333f080318..daf768c1b5 100644
--- a/ports/libsodium/CONTROL
+++ b/ports/libsodium/CONTROL
@@ -1,4 +1,4 @@
 Source: libsodium
-Version: 1.0.18
+Version: 1.0.18-1
 Description: A modern and easy-to-use crypto library
 Homepage: https://github.com/jedisct1/libsodium