diff --git a/src/quickfix.c b/src/quickfix.c
index ea7f5809a9..e65e43141b 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -4934,6 +4934,9 @@ qf_free_stack(win_T *wp, qf_info_T *qi)
 	 * location list */
 	qf_info_T *new_ll = ll_new_list();
 
+	/* first free the list reference in the location list window */
+	ll_free_all(&orig_wp->w_llist_ref);
+
 	orig_wp->w_llist_ref = new_ll;
 	if (llwin != NULL)
 	{
diff --git a/src/version.c b/src/version.c
index fd84c76740..1a6881f080 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    584,
 /**/
     583,
 /**/