diff -Naur honeyd-1.0/honeyd.8 honeyd-1.0.oden/honeyd.8
--- honeyd-1.0/honeyd.8	2004-12-24 08:11:54.000000000 +0100
+++ honeyd-1.0.oden/honeyd.8	2005-01-03 12:16:04.754510576 +0100
@@ -558,7 +558,7 @@
 .Ed
 .Sh FILES
 .Bl -tag -width {prefix}/share/honeyd/xprobe2.conf
-.It Pa /var/run/honeyd.pid
+.It Pa /var/run/honeyd/honeyd.pid
 The PID of the current daemon.
 .It Pa {prefix}/lib/honeyd/webserver/
 Python modules and web server documents used by the internal webserver.
diff -Naur honeyd-1.0/honeydctl.1 honeyd-1.0.oden/honeydctl.1
--- honeyd-1.0/honeydctl.1	2004-04-15 01:43:47.000000000 +0200
+++ honeyd-1.0.oden/honeydctl.1	2005-01-03 12:16:20.378135424 +0100
@@ -43,8 +43,8 @@
 about the template is returned.
 .El
 .Sh FILES
-.Bl -tag -width /var/run/honeyd.sock
-.It Pa /var/run/honeyd.pid
+.Bl -tag -width /var/lib/honeyd/honeyd.sock
+.It Pa /var/run/honeyd/honeyd.pid
 The default socket that
 .Nm
 connects to.
diff -Naur honeyd-1.0/honeydctl.c honeyd-1.0.oden/honeydctl.c
--- honeyd-1.0/honeydctl.c	2004-12-31 20:13:43.000000000 +0100
+++ honeyd-1.0.oden/honeydctl.c	2005-01-03 12:15:20.789194320 +0100
@@ -92,7 +92,7 @@
 char Buffer[LINELEN];
 
 #define CTLNAME		"honeydctl"
-#define HONEYD_SOCK	"/var/run/honeyd.sock"
+#define HONEYD_SOCK	"/var/lib/honeyd/honeyd.sock"
 
 int
 usage()
diff -Naur honeyd-1.0/honeyd.h honeyd-1.0.oden/honeyd.h
--- honeyd-1.0/honeyd.h	2004-12-31 20:13:42.000000000 +0100
+++ honeyd-1.0.oden/honeyd.h	2005-01-03 12:15:53.919157800 +0100
@@ -32,7 +32,7 @@
 #ifndef _HONEYD_H_
 #define _HONEYD_H_
 
-#define PIDFILE			"/var/run/honeyd.pid"
+#define PIDFILE			"/var/run/honeyd/honeyd.pid"
 
 #define TCP_DEFAULT_SIZE	512
 #define TCP_MAX_SIZE		4096
diff -Naur honeyd-1.0/ui.h honeyd-1.0.oden/ui.h
--- honeyd-1.0/ui.h	2004-12-31 20:13:43.000000000 +0100
+++ honeyd-1.0.oden/ui.h	2005-01-03 12:15:09.958840784 +0100
@@ -44,6 +44,6 @@
 
 void ui_init(void);
 
-#define UI_FIFO		"/var/run/honeyd.sock"
+#define UI_FIFO		"/var/lib/honeyd/honeyd.sock"
 
 #endif /* !_UI_H_ */