diff --git a/_service b/_service
index 3ce6ef4..7caa1fc 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
     <param name="url">https://github.com/xiph/rav1e.git</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="scm">git</param>
-    <param name="revision">v0.6.2</param>
+    <param name="revision">v0.6.4</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>
diff --git a/_servicedata b/_servicedata
index 679de7d..12b6f9c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/xiph/rav1e.git</param>
-              <param name="changesrevision">b57f8150d566ff353253e52d20623c2684243476</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">7121c0df0fd2443887b6ba5bd8eacfde60874d0c</param></service></servicedata>
\ No newline at end of file
diff --git a/rav1e-0.6.2+0.tar.xz b/rav1e-0.6.2+0.tar.xz
deleted file mode 100644
index bfe6de0..0000000
--- a/rav1e-0.6.2+0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b305406e2299d9ac6bb7bc373b3c235f9cf4a9897e07237eecb76a95d84e26b1
-size 2330036
diff --git a/rav1e-0.6.4+0.tar.xz b/rav1e-0.6.4+0.tar.xz
new file mode 100644
index 0000000..4ad3f25
--- /dev/null
+++ b/rav1e-0.6.4+0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51cc4a72eb27ba70fd1b4809d0c2d924a7760c504982c9796e0d82e2e68b07e9
+size 2323200
diff --git a/rav1e.changes b/rav1e.changes
index 69ff433..6217994 100644
--- a/rav1e.changes
+++ b/rav1e.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Tue Apr 11 09:53:40 UTC 2023 - asn@cryptomilk.org
+
+- Update to version 0.6.4+0:
+  * Safety critical bounds checking is off-by-one in sgrproj_box_ab_internal
+  * Initialize `low` array in a more rust-like way in `kmeans`
+  * Rework mutable borrows for symbol_with_update
+  * Drop explicit size for macro symbol_with_update
+  * Use const generics for CDFContextLog
+  * Fix undefined behavior in CDFContextLogOps
+  * ec: Simplify lr_compute function
+  * Use a bit counter instead of a byte counter in WriterRecorder
+  * Minimize bounds checks in pred functions
+  * Use generics for BD-8 on sgrproj functions
+  * Use saturating_sub in sgrproj_sum_finish
+  * Move bounds checks out of hot loop in sgrproj
+  * Ensure quantizer values are non-zero with a const fn
+  * Optimize base quants using NonZero integers (#3115)
+  * Move quant tables to separate file to improve organization (#3113)
+  * Use is_power_of_two method in divu_gen
+  * Fix rounding issue in HBD CDEF code
+  * Hint that creating a region from an empty plane is unlikely
+  * Minor optimization to take_slice
+  * Clean up cdef_dist
+  * Minor optimizations
+  * Optimizations for weighted_sse
+  * Add HBD AVX2 assembly for SAD (#3099)
+  * ec: Manually inline `msb()` and `ilog()` for clarity (#3104)
+  * Comment regarding cnt being unused
+  * Improve naming
+  * Use a bit counter instead of a byte counter in EC
+  * Add 10-bit cdef_dist ASM
+  * Optimise sad_plane_internal
+  * Save some bounds checks on me_stats
+  * Minor optimization to av1_get_mv_joint
+  * Use chunks_exact for performance in diff method
+  * Integrate CfL AC x86 assembly functions
+  * benches: Fix alignment issue for cfl_rdo
+  * Move luma_ac to predict module
+  * Extract luma_ac_internal with const generics
+  * Optimise plane::as_region
+  * Optimise BlockSize::from_width_and_height_opt
+  * Improve vectorization in get_sad
+  * Template entropy coding functions to help optimiser
+  * Enable SSE2/AVX512ICL put/prep/avg x86 assembly
+  * Enable AVX2 12-bit Inverse Transform x86 assembly
+  * Enable new SSE4.1 HBD Inverse Transform x86 assembly
+  * Pin assert_cmd, predicates and clap in Cargo.toml for rust 1.60.0
+  * Prepare for release
+  * Fix header coding for level_idx < 7.
+
 -------------------------------------------------------------------
 Mon Jan 02 15:54:31 UTC 2023 - asn@cryptomilk.org
 
diff --git a/rav1e.obsinfo b/rav1e.obsinfo
index 2d50837..f5fba24 100644
--- a/rav1e.obsinfo
+++ b/rav1e.obsinfo
@@ -1,4 +1,4 @@
 name: rav1e
-version: 0.6.2+0
-mtime: 1671946663
-commit: b57f8150d566ff353253e52d20623c2684243476
+version: 0.6.4+0
+mtime: 1681053966
+commit: 7121c0df0fd2443887b6ba5bd8eacfde60874d0c
diff --git a/rav1e.spec b/rav1e.spec
index 516bb36..52d5ae6 100644
--- a/rav1e.spec
+++ b/rav1e.spec
@@ -18,7 +18,7 @@
 
 
 Name:           rav1e
-Version:        0.6.2+0
+Version:        0.6.4+0
 Release:        0
 Summary:        Fastest and safest AV1 encoder
 License:        BSD-2-Clause
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 214c026..0243833 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b945fde342eaeb6875205c1fe4758b471bb366007aa299c6c259b9f25fdf78d4
-size 20685492
+oid sha256:01a3039dba4f057fe9e811458557217ac7255c74c89c05ee18515ac50d4ea372
+size 24443640