diff --git a/main/openssh/files/tmpfiles.conf b/main/openssh/files/tmpfiles.conf
new file mode 100644
index 0000000000..5565a228c9
--- /dev/null
+++ b/main/openssh/files/tmpfiles.conf
@@ -0,0 +1,6 @@
+# Create ssh state dirs
+
+d /etc/ssh/ssh_config.d 0755 root root -
+d /etc/ssh/sshd_config.d 0755 root root -
+
+d /var/chroot/ssh 0755 root root -
diff --git a/main/openssh/template.py b/main/openssh/template.py
index 8c50687b9c..98bc00fd92 100644
--- a/main/openssh/template.py
+++ b/main/openssh/template.py
@@ -1,6 +1,6 @@
 pkgname = "openssh"
 pkgver = "9.9_p1"
-pkgrel = 0
+pkgrel = 1
 build_style = "gnu_configure"
 configure_args = [
     "--datadir=/usr/share/openssh",
@@ -67,10 +67,7 @@ def post_install(self):
     self.install_bin("contrib/ssh-copy-id")
     self.install_man("contrib/ssh-copy-id.1")
 
-    self.install_dir("var/chroot/ssh", empty=True)
-
-    self.install_dir("etc/ssh/ssh_config.d", empty=True)
-    self.install_dir("etc/ssh/sshd_config.d", empty=True)
+    self.install_tmpfiles(self.files_path / "tmpfiles.conf")
 
     self.install_service(self.files_path / "ssh-keygen")
     self.install_service(self.files_path / "sshd")