diff --git a/ChangeLog b/ChangeLog
index f445fb40..0e9398f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,15 @@
 	* "Keep open" option for insert function dialogs
 	* Hide "Insert Emoji" expression context menu item
 
+2018-06-20 Hanna Knutsson <hanna.knutsson@protonmail.com>
+
+	* Do not retrieve exchange rates not needed
+	* Focus plot expression entry after graph added, modified or removed
+
+2018-06-13 Hanna Knutsson <hanna.knutsson@protonmail.com>
+
+	* Show currency flag also when symbol (instead of ISO code) is used. The flag is placed after number if the currency is placed in front of the number with no space inbetween.
+
 2018-06-02 Hanna Knutsson <hanna.knutsson@protonmail.com>
 
 	* Prefix completion suggestions and prefix handling in unit completion suggestions
diff --git a/configure.ac b/configure.ac
index 4bd32e15..1b39aab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl  ----------------------
 dnl | initialize autotools |---------------------------------------------------
 dnl  ----------------------
 
-AC_INIT([Qalculate! (GTK+ UI)], [2.6.0],[],[qalculate-gtk])
+AC_INIT([Qalculate! (GTK+ UI)], [2.6.1],[],[qalculate-gtk])
 AC_CONFIG_SRCDIR([src/callbacks.cc])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/callbacks.cc b/src/callbacks.cc
index 2b9b18e1..553ea05e 100644
--- a/src/callbacks.cc
+++ b/src/callbacks.cc
@@ -1129,7 +1129,7 @@ bool check_exchange_rates(GtkWidget *win = NULL, bool set_result = false) {
 	if(b || auto_update_exchange_rates > 0) {
 		if(auto_update_exchange_rates <= 0) i = -1;
 		if(!b && set_result) setResult(NULL, false, false, false, "", 0, false);
-		fetch_exchange_rates(b ? 15 : 8);
+		fetch_exchange_rates(b ? 15 : 8, i);
 		CALCULATOR->loadExchangeRates();
 		return true;
 	}
@@ -11964,7 +11964,7 @@ void load_preferences() {
 #endif
 	}
 
-	int version_numbers[] = {2, 6, 0};
+	int version_numbers[] = {2, 6, 1};
 	bool old_history_format = false;
 			
 	if(file) {
@@ -12705,7 +12705,7 @@ void save_preferences(bool mode) {
 	fprintf(file, "rpn_keys=%i\n", rpn_keys);
 	fprintf(file, "display_expression_status=%i\n", display_expression_status);
 	fprintf(file, "enable_completion=%i\n", enable_completion);
-	fprintf(file, "enable_completion2=%i\n", enable_completion);
+	fprintf(file, "enable_completion2=%i\n", enable_completion2);
 	fprintf(file, "completion_min=%i\n", completion_min);
 	fprintf(file, "completion_min2=%i\n", completion_min2);
 	fprintf(file, "completion_delay=%i\n", completion_delay);