diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce27230..a41c3e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Partial documentation for hipFFT is available at [hipFFT].
   old file name is installed, and the old BUILD_CLIENTS_RIDER CMake option is accepted for compatibility but both 
   will be removed in a future release.
 - Binaries in debug builds no longer have a "-d" suffix.
+- The minimum rocFFT required version has been updated to 1.0.21.
 
 ## hipFFT 1.0.12 for ROCm 5.6.0
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ab5a59..aa54e4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,7 +230,7 @@ endif()
 if( ROCM_FOUND )
   # Package specific CPACK vars
   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-    rocm_package_add_dependencies(DEPENDS "rocfft >= 1.0.19")
+    rocm_package_add_dependencies(DEPENDS "rocfft >= 1.0.21")
   else()
     rocm_package_add_dependencies(DEPENDS "cufft >= 10.0.0")
   endif()
diff --git a/clients/rocFFT b/clients/rocFFT
index 6f59516..da63d10 160000
--- a/clients/rocFFT
+++ b/clients/rocFFT
@@ -1 +1 @@
-Subproject commit 6f5951676e540eca32e4399527ce2176e3a8998a
+Subproject commit da63d104902afd5b26f071985bcadc053799c457
diff --git a/clients/tests/gtest_main.cpp b/clients/tests/gtest_main.cpp
index c6423b6..1f0ae83 100644
--- a/clients/tests/gtest_main.cpp
+++ b/clients/tests/gtest_main.cpp
@@ -89,6 +89,9 @@ double max_l2_eps_half     = 0.0;
 // Control whether we use FFTW's wisdom (which we use to imply FFTW_MEASURE).
 bool use_fftw_wisdom = false;
 
+// Compare results against FFTW in accuracy tests
+bool fftw_compare = true;
+
 // Cache the last cpu fft that was requested
 last_cpu_fft_cache last_cpu_fft_data;
 
@@ -236,7 +239,9 @@ int main(int argc, char* argv[])
         ("seed", po::value<size_t>(&random_seed),
          "Random seed; if unset, use an actual random seed.")
         ("callback_prob", po::value<double>(&callback_prob)->default_value(0.1),
-         "Probability of running individual callback transforms");
+         "Probability of running individual callback transforms")
+        ("fftw_compare",
+         po::value<bool>(&fftw_compare)->default_value(true), "Compare to FFTW in accuracy tests");
     // clang-format on
 
     po::variables_map vm;