--- a/extern.h
+++ b/extern.h
@@ -396,7 +396,7 @@ int		 output_json(FILE *, struct vrp_tre
 void		 logx(const char *fmt, ...)
 			__attribute__((format(printf, 1, 2)));
 
-#define		RPKI_PATH_OUT_DIR	"/var/db/rpki-client"
+#define		RPKI_PATH_OUT_DIR	"/var/lib/rpki-client"
 #define		RPKI_PATH_BASE_DIR	"/var/cache/rpki-client"
 
 #endif /* ! EXTERN_H */
--- a/main.c
+++ b/main.c
@@ -1333,7 +1333,7 @@ entity_process(int proc, int rsync, stru
 static size_t
 tal_load_default(const char *tals[], size_t max)
 {
-	static const char *confdir = "/etc/rpki";
+	static const char *confdir = "/etc/tals";
 	size_t s = 0;
 	char *path;
 	DIR *dirp;
@@ -1470,7 +1470,7 @@ main(int argc, char *argv[])
 	if (talsz == 0)
 		talsz = tal_load_default(tals, TALSZ_MAX);
 	if (talsz == 0)
-		err(1, "no TAL files found in %s", "/etc/rpki");
+		err(1, "no TAL files found in %s", "/etc/tals");
 
 	memset(&rt, 0, sizeof(struct repotab));
 	memset(&stats, 0, sizeof(struct stats));
--- a/rpki-client.8
+++ b/rpki-client.8
@@ -67,7 +67,7 @@ The directory where
 .Nm
 will store the cached repository data.
 Defaults to
-.Pa /var/db/rpki-client/ .
+.Pa /var/lib/rpki-client/ .
 .It Fl e Ar rsync_prog
 Use
 .Ar rsync_prog
@@ -117,7 +117,7 @@ This option can be used multiple times t
 By default
 .Nm
 will load all TAL files in
-.Pa /etc/rpki .
+.Pa /etc/tals .
 .It Fl v
 Specified once, prints information about status.
 Twice, prints each filename as it's processed.
@@ -126,7 +126,7 @@ The directory where
 .Nm
 will write the output files.
 Defaults to
-.Pa /var/db/rpki-client/ .
+.Pa /var/lib/rpki-client/ .
 .El
 .Pp
 By default
@@ -139,14 +139,14 @@ statements in
 .\" .Sh ENVIRONMENT
 .\" For sections 1, 6, 7, and 8 only.
 .Sh FILES
-.Bl -tag -width "/var/db/rpki-client/openbgpd" -compact
-.It Pa /etc/rpki/*.tal
+.Bl -tag -width "/var/lib/rpki-client/openbgpd" -compact
+.It Pa /etc/tals/*.tal
 default TAL files used unless
 .Fl t Ar tal
 is specified.
 .It Pa /var/cache/rpki-client
 cached repository data.
-.It Pa /var/db/rpki-client/openbgpd
+.It Pa /var/lib/rpki-client/openbgpd
 default roa-set output file.
 .El
 .Sh EXIT STATUS
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ BINS	 = rpki-client \
 	   test-mft \
 	   test-roa \
 	   test-tal
-RSYNC 	 = openrsync
+RSYNC 	 = rsync
 PRIVDROP = _rpki-client
 
 # Our rsync binary defaulting to openrsync.
