diff --git a/configure.ac b/configure.ac
index d0f5432f..52902e87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ if test "$prefix" = "NONE"; then
 	fi
 	dnl Fix "sysconfdir" variable if not specified
 	if test "$sysconfdir" = "\${prefix}/etc"; then
-		sysconfdir="/etc"
+		sysconfdir="/etc/corosync"
 	fi
 	dnl Fix "libdir" variable if not specified
 	if test "$libdir" = "\${exec_prefix}/lib"; then
diff --git a/exec/coroparse.c b/exec/coroparse.c
index 08919179..edf31467 100644
--- a/exec/coroparse.c
+++ b/exec/coroparse.c
@@ -219,7 +219,7 @@ static int read_uidgid_files_into_objdb(
 	int res = 0;
 	struct stat stat_buf;
 
-	dirname = SYSCONFDIR "/corosync/uidgid.d";
+	dirname = SYSCONFDIR "/uidgid.d";
 	dp = opendir (dirname);
 
 	if (dp == NULL)
diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index f500708a..69bc1843 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -764,7 +764,7 @@ int totem_config_keyread (
 	if (!got_key) {
 		const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
 		if (!filename)
-			filename = SYSCONFDIR "/ais/authkey";
+			filename = SYSCONFDIR "/authkey";
 		res = read_keyfile(filename, totem_config, error_string);
 		if (res)
 			goto key_error;
diff --git a/tools/corosync-keygen.c b/tools/corosync-keygen.c
index c7f2e2e8..50512ddf 100644
--- a/tools/corosync-keygen.c
+++ b/tools/corosync-keygen.c
@@ -44,7 +44,7 @@
 
 #include <netinet/in.h>
 
-#define KEYFILE SYSCONFDIR "/ais/authkey"
+#define KEYFILE SYSCONFDIR "/authkey"
 
 int main (void) {
 	int authkey_fd;
@@ -57,7 +57,7 @@ int main (void) {
 		printf ("Error: Authorization key must be generated as root user.\n");
 		exit (1);
 	}
-	if (mkdir (SYSCONFDIR "/ais", 0700)) {
+	if (mkdir (SYSCONFDIR, 0700)) {
 		if (errno != EEXIST) {
 			perror ("Failed to create directory: " SYSCONFDIR "/ais");
 			exit (1);