diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake
index 0b5d13f449..811632bfd1 100644
--- a/ports/roaring/portfile.cmake
+++ b/ports/roaring/portfile.cmake
@@ -1,20 +1,15 @@
-if (TARGET_TRIPLET MATCHES "^x86")
-    message(WARNING "The CRoaring authors recommend users of this lib against using a 32-bit build.")
-endif ()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO RoaringBitmap/CRoaring
     REF "v${VERSION}"
-
-    SHA512 c51e426c13045f45b907bc2801fcb01a2bb0620054ad5c2bb113fe486f77e292c85f29348e7d4d1c61f0263845be9403b754f418d81c293c5e2fb9e5407386b0
+    SHA512 bfffdde8b9e870fd509f83a073cace14c0bcd969f6f8649ae8fd2c679174d8c6549fee59d9e166f9c409f1f26f73951e24664dc0098a5ccc4e024d0f14cdd881
     HEAD_REF master
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC}
@@ -25,11 +20,10 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/roaring)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json
index 4634f1457c..52002a54a7 100644
--- a/ports/roaring/vcpkg.json
+++ b/ports/roaring/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "roaring",
-  "version": "0.9.6",
+  "version": "2.0.4",
   "description": "A better compressed bitset in C (and C++)",
   "homepage": "https://github.com/RoaringBitmap/CRoaring",
   "license": "Apache-2.0 OR MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3cea19980a..4bec34e2c5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7525,7 +7525,7 @@
       "port-version": 0
     },
     "roaring": {
-      "baseline": "0.9.6",
+      "baseline": "2.0.4",
       "port-version": 0
     },
     "robin-hood-hashing": {
diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json
index 4e24e50e07..2e81b9abe1 100644
--- a/versions/r-/roaring.json
+++ b/versions/r-/roaring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0179f926fd785b55019104fb010fb99ebcfa5e06",
+      "version": "2.0.4",
+      "port-version": 0
+    },
     {
       "git-tree": "d1f8636ba82d39c12bea0f5a09409a5a5321432a",
       "version": "0.9.6",