--- src/ocserv-args.def.orig	2015-10-13 09:47:33 UTC
+++ src/ocserv-args.def
@@ -68,7 +68,7 @@ doc-section = {
   ds-format = 'texi';
   ds-text   = <<-_EOT_
 @subheading ocserv's configuration file format
-By default, if no other file is specified, ocserv looks for its configuration file at @file{/etc/ocserv/ocserv.conf}.
+By default, if no other file is specified, ocserv looks for its configuration file at @file{/usr/local/etc/ocserv/conf}.
 An example configuration file follows.
 
 @example
@@ -87,7 +87,7 @@ An example configuration file follows.
 #  This enabled PAM authentication of the user. The gid-min option is used 
 # by auto-select-group option, in order to select the minimum valid group ID.
 #
-# plain[passwd=/etc/ocserv/ocpasswd,otp=/etc/ocserv/users.otp]
+# plain[passwd=/usr/local/etc/ocserv/ocpasswd,otp=/usr/local/etc/ocserv/users.otp]
 #  The plain option requires specifying a password file which contains
 # entries of the following format.
 # "username:groupname1,groupname2:encoded-password"
@@ -121,7 +121,7 @@ An example configuration file follows.
 #auth = "certificate"
 #auth = "pam"
 #auth = "pam[gid-min=1000]"
-#auth = "plain[passwd=/etc/ocserv/ocpasswd]"
+#auth = "plain[passwd=/usr/local/etc/ocserv/ocpasswd]"
 #auth = "radius[config=/etc/radiusclient/radiusclient.conf,groupconfig=true]"
 
 # Specify alternative authentication methods that are sufficient
@@ -437,7 +437,7 @@ rekey-method = ssl
 use-occtl = true
 
 # PID file. It can be overriden in the command line.
-pid-file = /var/run/ocserv.pid
+pid-file = /var/run/ocserv/pid
 
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
 # be sent. That is a number from 0 to 6 with 0 being the lowest
@@ -564,13 +564,13 @@ no-route = 192.168.5.0/255.255.255.0
 # Also explicit addresses, are only allowed when they are odd. In that
 # case the next even address will be used as the remote address (in PtP).
 
-#config-per-user = /etc/ocserv/config-per-user/
-#config-per-group = /etc/ocserv/config-per-group/
+#config-per-user = /usr/local/etc/ocserv/config-per-user/
+#config-per-group = /usr/local/etc/ocserv/config-per-group/
 
 # When config-per-xxx is specified and there is no group or user that
 # matches, then utilize the following configuration.
-#default-user-config = /etc/ocserv/defaults/user.conf
-#default-group-config = /etc/ocserv/defaults/group.conf
+#default-user-config = /usr/local/etc/ocserv/defaults/user.conf
+#default-group-config = /usr/local/etc/ocserv/defaults/group.conf
 
 # The system command to use to setup a route. %{R} will be replaced with the
 # route/mask and %{D} with the (tun) device.