diff --git a/src/core/log-away.c b/src/core/log-away.c
index d6dac4d9..6e58ad5d 100644
--- a/src/core/log-away.c
+++ b/src/core/log-away.c
@@ -111,7 +111,10 @@ void log_away_init(void)
 	away_filepos = 0;
 	away_msgs = 0;
 
-	awaylog_file = g_strconcat(get_irssi_dir(), "/away.log", NULL);
+	if (is_xdg_supported())
+		awaylog_file = g_build_filename(g_get_user_cache_dir(), "irssi", "away.log", NULL);
+	else
+		awaylog_file = g_strconcat(get_irssi_dir(), "/away.log", NULL);
 	settings_add_str("log", "awaylog_file", awaylog_file);
 	g_free(awaylog_file);
 	settings_add_level("log", "awaylog_level", "msgs hilight");
diff --git a/src/core/modules-load.c b/src/core/modules-load.c
index a3598c65..b5c839f0 100644
--- a/src/core/modules-load.c
+++ b/src/core/modules-load.c
@@ -115,7 +115,10 @@ static GModule *module_open(const char *name, int *found)
 		path = g_strdup(name);
 	else {
 		/* first try from home dir */
-		str = g_strdup_printf("%s/modules", get_irssi_dir());
+		if (is_xdg_supported())
+			str = g_build_filename(g_get_user_data_dir(), "irssi", "modules", NULL);
+		else
+			str = g_strdup_printf("%s/modules", get_irssi_dir());
 		path = g_module_build_path(str, name);
 		g_free(str);
 
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 1b891522..48d30ff7 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -281,7 +281,7 @@ static void check_files(void)
 	struct stat statbuf;
 
 	if (stat(get_irssi_dir(), &statbuf) != 0) {
-		/* ~/.irssi doesn't exist, first time running irssi */
+		/* irssi config folder doesn't exist, first time running irssi */
 		display_firsttimer = TRUE;
 	}
 }