diff --git a/ChangeLog b/ChangeLog
index 8567ec8a7..315082d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ Version 0.4.0 (under dev!)
   hook_connect (task #11205)
 * alias: give higher priority to aliases (2000) so that they take precedence
   over an existing command
+* aspell: store dictionaries in buffer local variable "aspell_dict"
 * aspell: ignore self and remote nicks in private buffers
 * aspell: add signal "aspell_suggest" (sent when new suggestions are displayed)
 * aspell: add bar items "aspell_dict" (dictionary used on current buffer) and
diff --git a/src/plugins/aspell/weechat-aspell-bar-item.c b/src/plugins/aspell/weechat-aspell-bar-item.c
index a23614b49..44e469e26 100644
--- a/src/plugins/aspell/weechat-aspell-bar-item.c
+++ b/src/plugins/aspell/weechat-aspell-bar-item.c
@@ -50,7 +50,8 @@ weechat_aspell_bar_item_dict (void *data, struct t_gui_bar_item *item,
     buffer = weechat_window_get_pointer (window, "buffer");
     if (buffer)
     {
-        dict_list = weechat_aspell_get_dict (buffer);
+        dict_list = weechat_buffer_get_string (buffer,
+                                               "localvar_aspell_dict");
         if (dict_list)
             return strdup (dict_list);
     }
diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c
index 039c4fa9d..276ad7887 100644
--- a/src/plugins/aspell/weechat-aspell.c
+++ b/src/plugins/aspell/weechat-aspell.c
@@ -362,7 +362,10 @@ weechat_aspell_create_spellers (struct t_gui_buffer *buffer)
                 }
                 weechat_string_free_split (argv);
             }
+            weechat_buffer_set (buffer, "localvar_set_aspell_dict", dict_list);
         }
+        else
+            weechat_buffer_set (buffer, "localvar_del_aspell_dict", "");
         weechat_bar_item_update ("aspell_dict");
     }
 }