diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 8c074b4b..f1d48285 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -393,7 +393,6 @@ default_file (void)
 /* Keep these sorted!! */
 
 const struct prefs vars[] = {
-	{"auto_save", P_OFFINT (autosave), TYPE_BOOL},
 	{"auto_save_url", P_OFFINT (autosave_url), TYPE_BOOL},
 
 	{"away_auto_unmark", P_OFFINT (auto_unmark_away), TYPE_BOOL},
@@ -683,7 +682,6 @@ load_config (void)
 	prefs.fastdccsend = 1;
 #endif
 	prefs.wordwrap = 1;
-	prefs.autosave = 1;
 	prefs.autodialog = 1;
 	prefs.gui_input_spell = 1;
 	prefs.autoreconnect = 1;
@@ -1142,7 +1140,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	{
 		PrintText (sess, "No such variable.\n");
 	}
-	else if (prefs.autosave && !save_config ())
+	else if (!save_config ())
 	{
 		PrintText (sess, "Error saving changes to disk.\n");
 	}
diff --git a/src/common/xchat.c b/src/common/xchat.c
index 12c31379..7e9cc8c7 100644
--- a/src/common/xchat.c
+++ b/src/common/xchat.c
@@ -847,14 +847,18 @@ xchat_exit (void)
 	in_xchat_exit = TRUE;
 	plugin_kill_all ();
 	fe_cleanup ();
-	if (prefs.autosave)
+
+	save_config ();
+	if (prefs.save_pevents)
 	{
-		save_config ();
-		if (prefs.save_pevents)
-			pevent_save (NULL);
+		pevent_save (NULL);
 	}
+
 	if (prefs.autosave_url)
+	{
 		url_autosave ();
+	}
+
 	sound_save ();
 	notify_save ();
 	ignore_save ();
diff --git a/src/common/xchat.h b/src/common/xchat.h
index d9a64d68..ba83c1b1 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -208,7 +208,6 @@ struct xchatprefs
 	unsigned int mainwindow_save;
 	unsigned int perc_color;
 	unsigned int perc_ascii;
-	unsigned int autosave;
 	unsigned int autodialog;
 	unsigned int autosave_url;
 	unsigned int autoreconnect;
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index 514d4be0..ec5a6bd3 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -532,7 +532,6 @@ void
 fe_init (void)
 {
 	/* the following should be default generated, not enfoced in binary */
-	prefs.autosave = 0;
 	prefs.use_server_tab = 0;
 	prefs.autodialog = 0;
 	/* except for these, there is no lag meter, there is no server list */