diff -Nru r-cran-rstan-2.21.5/debian/changelog r-cran-rstan-2.21.5/debian/changelog
--- r-cran-rstan-2.21.5/debian/changelog	2022-05-17 07:54:54.000000000 +0000
+++ r-cran-rstan-2.21.5/debian/changelog	2022-09-03 21:06:28.000000000 +0000
@@ -1,3 +1,16 @@
+r-cran-rstan (2.21.5-2) unstable; urgency=medium
+
+  * Team Upload.
+  [ Andreas Tille ]
+  * Rebuild
+
+  [ Nilesh Patra ]
+  * Add in versioned B-D and dep on r-cran-stanheaders to
+    ease rebuilding/transition
+    (Closes: #1011218, #1012144, #1012219)
+
+ -- Nilesh Patra <nilesh@debian.org>  Sun, 04 Sep 2022 02:36:28 +0530
+
 r-cran-rstan (2.21.5-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru r-cran-rstan-2.21.5/debian/control r-cran-rstan-2.21.5/debian/control
--- r-cran-rstan-2.21.5/debian/control	2022-05-17 07:52:36.000000000 +0000
+++ r-cran-rstan-2.21.5/debian/control	2022-09-03 20:56:54.000000000 +0000
@@ -7,7 +7,7 @@
 Build-Depends: debhelper-compat (= 13),
                dh-r,
                r-base-dev,
-               r-cran-stanheaders (>= 2.21.0),
+               r-cran-stanheaders (>= 2.21.0-7-2~),
                r-cran-ggplot2,
                r-cran-inline,
                r-cran-gridextra,
@@ -27,7 +27,8 @@
 Architecture: any
 Depends: ${R:Depends},
          ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         r-cran-stanheaders (>= 2.21.0-7-2~),
 Recommends: ${R:Recommends}
 Suggests: ${R:Suggests}
 Description: GNU R interface to Stan
diff -Nru r-cran-rstan-2.21.5/debian/patches/remove-stanheaders-in-deps.patch r-cran-rstan-2.21.5/debian/patches/remove-stanheaders-in-deps.patch
--- r-cran-rstan-2.21.5/debian/patches/remove-stanheaders-in-deps.patch	1970-01-01 00:00:00.000000000 +0000
+++ r-cran-rstan-2.21.5/debian/patches/remove-stanheaders-in-deps.patch	2022-09-03 20:58:09.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/DESCRIPTION
++++ b/DESCRIPTION
+@@ -33,7 +33,7 @@
+ NeedsCompilation: yes
+ Imports: methods, stats4, inline, gridExtra (>= 2.0.0), Rcpp (>=
+         0.12.0), RcppParallel (>= 5.0.1), loo (>= 2.3.0), pkgbuild
+-Depends: R (>= 3.4.0), StanHeaders (>= 2.21.0), ggplot2 (>= 3.0.0)
++Depends: R (>= 3.4.0), ggplot2 (>= 3.0.0)
+ LinkingTo: Rcpp (>= 0.12.0), RcppEigen (>= 0.3.3.3.0), BH (>= 1.66.0),
+            StanHeaders (>= 2.21.0), RcppParallel
+ Suggests: RUnit, RcppEigen (>= 0.3.3.3.0), BH (>= 1.66.0), parallel,
diff -Nru r-cran-rstan-2.21.5/debian/patches/series r-cran-rstan-2.21.5/debian/patches/series
--- r-cran-rstan-2.21.5/debian/patches/series	2021-12-31 14:08:47.000000000 +0000
+++ r-cran-rstan-2.21.5/debian/patches/series	2022-09-03 20:57:50.000000000 +0000
@@ -1,2 +1,3 @@
 fix_library_locations.patch
 unversioned_bh.patch
+remove-stanheaders-in-deps.patch