--- a/src/bgplgd/bgplgd.8.in
+++ b/src/bgplgd/bgplgd.8.in
@@ -38,8 +38,8 @@ is a simple server that implements a sim
 .Pp
 .Nm
 opens a socket at
-.Pa /var/www/run/bgplgd.sock ,
-owned by www:www,
+.Pa /run/bgplgd.sock ,
+owned by www-data:www-data,
 with permissions 0660.
 It will then drop privileges to user
 .Qq @BGPLGD_USER@ ,
@@ -68,7 +68,7 @@ to query
 Use
 .Ar socket
 instead of the default
-.Pa @RUNSTATEDIR@/bgpd.rsock
+.Pa @RUNSTATEDIR@/bgpd.sock
 to communicate with
 .Xr bgpd 8 .
 .It Fl s Ar socket
@@ -76,7 +76,7 @@ Create and bind to alternative local soc
 .Ar socket .
 .It Fl U Ar user
 Change the owner of
-.Pa /var/www/run/bgplgd.sock
+.Pa /run/bgplgd.sock
 to
 .Ar user
 and its primary group instead of the default www:www.
--- a/src/bgplgd/slowcgi.c
+++ b/src/bgplgd/slowcgi.c
@@ -47,7 +47,7 @@
 
 #define TIMEOUT_DEFAULT		 30
 #ifndef	WWW_USER
-#define WWW_USER		 "www"
+#define WWW_USER		 "www-data"
 #endif
 #ifndef	BGPLGD_USER
 #define BGPLGD_USER		 "_bgplgd"
@@ -229,12 +229,12 @@ struct timeval		kill_timeout = { 5, 0 };
 struct slowcgi_proc	slowcgi_proc;
 int			debug = 0;
 int			on = 1;
-char			*fcgi_socket = "/var/www/run/bgplgd.sock";
+char			*fcgi_socket = "/run/bgplgd.sock";
 char			*bgpctlpath = "bgpctl";
 #ifndef RUNSTATEDIR
 #define RUNSTATEDIR "/var/run"
 #endif
-char			*bgpctlsock = RUNSTATEDIR "/bgpd.rsock";
+char			*bgpctlsock = RUNSTATEDIR "/bgpd.sock";
 
 
 /*
--- a/bgpd.conf
+++ b/bgpd.conf
@@ -14,7 +14,7 @@ prefix-set mynetworks {
 	2001:db8:abcd::/48
 }
 
-include "/var/db/rpki-client/openbgpd"
+include "/var/lib/rpki-client/openbgpd"
 
 # define bogon prefixes which should not be part of the DFZ
 prefix-set bogons {
