diff --git a/src/booth.h b/src/booth.h
index cf75ced..d4e389b 100644
--- a/src/booth.h
+++ b/src/booth.h
@@ -1,210 +1,214 @@
 /* 
  * Copyright (C) 2011 Jiaju Zhang <jjzhang@suse.de>
  * Copyright (C) 2013 Philipp Marek <philipp.marek@linbit.com>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef _BOOTH_H
 #define _BOOTH_H
 
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
 /* TODO: Remove */
 #define BOOTH_LOG_DUMP_SIZE (1024*1024)
 
 #define BOOTH_RUN_DIR "/var/run/booth/"
 #define BOOTH_LOG_DIR "/var/log"
 #define BOOTH_LOGFILE_NAME "booth.log"
-#define BOOTH_DEFAULT_CONF "/etc/booth/booth.conf"
+#define BOOTH_DEFAULT_CONF_DIR "/etc/booth/"
+#define BOOTH_DEFAULT_CONF_NAME "booth"
+#define BOOTH_DEFAULT_CONF_EXT ".conf"
+#define BOOTH_DEFAULT_CONF \
+	BOOTH_DEFAULT_CONF_DIR BOOTH_DEFAULT_CONF_NAME BOOTH_DEFAULT_CONF_EXT
 
 #define DAEMON_NAME		"booth"
 #define BOOTH_PATH_LEN		127
 
 #define BOOTH_DEFAULT_PORT		9929
 
 /* TODO: remove */
 #define BOOTH_PROTO_FAMILY	AF_INET
 
 #define BOOTHC_MAGIC		0x5F1BA08C
 #define BOOTHC_VERSION		0x00010002
 
 
 /** Timeout value for poll().
  * Determines frequency of periodic jobs, eg. when send-retries are done.
  * See process_tickets(). */
 #define POLL_TIMEOUT	1000
 
 
 /** @{ */
 /** The on-network data structures and constants. */
 
 #define BOOTH_NAME_LEN		64
 
 #define NO_OWNER (-1)
 
 typedef unsigned char boothc_site  [BOOTH_NAME_LEN];
 typedef unsigned char boothc_ticket[BOOTH_NAME_LEN];
 
 
 struct boothc_header {
 	/** BOOTHC_MAGIC */
 	uint32_t magic;
 	/** BOOTHC_VERSION */
 	uint32_t version;
 
 	/** Packet source; site_id. See add_site(). */
 	uint32_t from;
 
 	/** Length including header */
 	uint32_t length;
 
 	/** The command respectively protocol state. See cmd_request_t. */
 	uint32_t cmd;
 	/** Result of operation. 0 == OK */
 	uint32_t result;
 
 	char data[0];
 } __attribute__((packed));
 
 
 struct ticket_msg {
 	/** Ticket name. */
 	boothc_ticket id;
 
 	/** Owner. May be NO_OWNER. See add_site().  */
 	uint32_t owner;
 
 	/** Current ballot number. Might be < prev_ballot if overflown. */
 	uint32_t ballot;
 	/** Previous ballot. */
 	uint32_t prev_ballot;
 
 	/** Seconds until expiration. */
 	uint32_t expiry;
 } __attribute__((packed));
 
 
 struct boothc_ticket_msg {
 	struct boothc_header header;
 	struct ticket_msg ticket;
 } __attribute__((packed));
 
 
 /* Use numbers that are unlikely to conflict with other enums.
  * All these have to be swabbed to network order before sending. */
 typedef enum {
 	/* 0x43 = "C"ommands */
 	CMD_LIST    = 0x436d644c,
 	CMD_GRANT   = 0x436d6447,
 	CMD_REVOKE  = 0x436d6452,
 	CMD_CATCHUP = 0x436d6443,
 
 	/* Replies */
 	CMR_GENERAL = 0x52706c67,
 	CMR_LIST    = 0x52706c4c,
 	CMR_GRANT   = 0x52706c47,
 	CMR_REVOKE  = 0x52706c52,
 	CMR_CATCHUP = 0x52706c43,
 
 	/* Paxos */
 	OP_PREPARING = 0x50726570,
 	OP_PROMISING = 0x50726f6d,
 	OP_PROPOSING = 0x50726f70,
 	OP_ACCEPTING = 0x41636354,
 	OP_RECOVERY  = 0x5265636f,
 	OP_COMMITTED = 0x436f6d6d,
 	OP_REJECTED  = 0x52656a65,
 
 	/* These are not used over the wire */
 	ST_INIT      = 0x496e6974,
 	ST_STABLE    = 0x53746162,
 } cmd_request_t;
 
 
 typedef enum {
 	/* for compatibility with other functions */
 	RLT_SUCCESS = 0,
 	RLT_ASYNC = 0x526c5401,
 	RLT_SYNC_SUCC,
 	RLT_SYNC_FAIL,
 	RLT_INVALID_ARG,
 	RLT_REMOTE_OP,
 	RLT_OVERGRANT,
 } cmd_result_t;
 
 
 /** @} */
 
 /** @{ */
 
 struct booth_site {
 	/** Calculated ID. See add_site(). */
 	int site_id;
 	int type;
 	int local;
 
 	int role;
 
 	char addr_string[BOOTH_NAME_LEN];
 
 	int tcp_fd;
 	int udp_fd;
 
 	/* 0-based, used for indexing into per-ticket weights */
 	int index;
 	uint64_t bitmask;
 
 	unsigned short family;
 	union {
 		struct sockaddr_in  sa4;
 		struct sockaddr_in6 sa6;
 	};
 	int saddrlen;
 	int addrlen;
 } __attribute__((packed));
 
 
 
 extern struct booth_site *local;
 
 /** @} */
 
 struct booth_transport;
 
 struct client {
 	int fd;
 	const struct booth_transport *transport;
 	void (*workfn)(int);
 	void (*deadfn)(int);
 };
 
 extern struct client *clients;
 extern struct pollfd *pollfds;
 
 
 int client_add(int fd, const struct booth_transport *tpt,
 		void (*workfn)(int ci), void (*deadfn)(int ci));
 int do_read(int fd, void *buf, size_t count);
 int do_write(int fd, void *buf, size_t count);
 void process_connection(int ci);
 void safe_copy(char *dest, char *value, size_t buflen, const char *description);
 
 
 #endif /* _BOOTH_H */