diff --git a/backuppc/manifests/init.pp b/backuppc/manifests/init.pp
index 570bf10..c6bc19e 100644
--- a/backuppc/manifests/init.pp
+++ b/backuppc/manifests/init.pp
@@ -77,7 +77,7 @@ class backuppc::server {
             force   => true,
             backup  => ".orig",
             require => File["${backuppc_datadir}"],
-            before  => Service["backuppc"],
+            before  => File["/var/lib/BackupPC/.ssh"],
         }
     }
 
@@ -162,6 +162,15 @@ class backuppc::server {
         require => File["/var/lib/BackupPC/.ssh"],
         before  => Service["backuppc"],
     }
+    file { "/var/lib/BackupPC/.ssh/id_rsa.pub":
+        ensure  => present,
+        source  => "/etc/ssh/ssh_host_rsa_key.pub",
+        mode    => 0640,
+        owner   => "root",
+        group   => "backuppc",
+        require => File["/var/lib/BackupPC/.ssh"],
+        before  => Service["backuppc"],
+    }
     @@ssh_authorized_key { "backuppc":
         ensure  => present,
         key     => $sshrsakey,