diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index b9745ba629b0..983fe03ad491 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -1,27 +1,28 @@
 # Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 
 PORTNAME=	snappy
 PORTVERSION=	1.1.9
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Fast compressor/decompressor library
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	SNAPPY_BUILD_TESTS SNAPPY_BUILD_BENCHMARKS
 CMAKE_BUILD_TYPE=	Release
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 SUB_FILES+=	snappy.pc
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${PORTVERSION}
 	${INSTALL_DATA} ${WRKDIR}/snappy.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt
index cc912901362c..306df294b015 100644
--- a/archivers/snappy/files/patch-CMakeLists.txt
+++ b/archivers/snappy/files/patch-CMakeLists.txt
@@ -1,61 +1,74 @@
 --- CMakeLists.txt.orig	2021-05-04 22:53:34 UTC
 +++ CMakeLists.txt
-@@ -213,8 +213,7 @@ configure_file(
+@@ -78,8 +78,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+ 
+   # Disable RTTI.
+-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
++  if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") # devel/folly requires RTTI info, see https://github.com/facebook/folly/issues/1606
++    string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
++  endif()
+ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ 
+ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
+@@ -213,8 +215,7 @@ configure_file(
    "snappy-stubs-public.h.in"
    "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
  
 -add_library(snappy "")
 -target_sources(snappy
 +set(SNAPPY_SRCS
    PRIVATE
      "snappy-internal.h"
      "snappy-stubs-internal.h"
-@@ -235,20 +234,35 @@ target_sources(snappy
+@@ -235,20 +236,35 @@ target_sources(snappy
      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
      $<INSTALL_INTERFACE:include/snappy-stubs-public.h>
  )
 -target_include_directories(snappy
 +set(SNAPPY_INCS
    PUBLIC
      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
      $<INSTALL_INTERFACE:include>
  )
 +add_library(snappy SHARED)
 +target_sources(snappy ${SNAPPY_SRCS})
 +target_include_directories(snappy ${SNAPPY_INCS})
  set_target_properties(snappy
    PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
  
  target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H)
 -if(BUILD_SHARED_LIBS)
 -  set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 -endif(BUILD_SHARED_LIBS)
 +set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
  
 +add_library(snappy-static STATIC)
 +target_sources(snappy-static ${SNAPPY_SRCS})
 +target_include_directories(snappy-static ${SNAPPY_INCS})
 +set_target_properties(snappy-static
 +  PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 +
 +target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H)
 +
 +if (MSVC)
 +    set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static)
 +else()
 +    set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy)
 +endif()
 +
  if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
    add_library(snappy_test_support "")
    target_sources(snappy_test_support
-@@ -359,7 +373,7 @@ endif(SNAPPY_FUZZING_BUILD)
+@@ -359,7 +375,7 @@ endif(SNAPPY_FUZZING_BUILD)
  include(GNUInstallDirs)
  
  if(SNAPPY_INSTALL)
 -  install(TARGETS snappy
 +  install(TARGETS snappy snappy-static
      EXPORT SnappyTargets
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}