diff --git a/ChangeLog b/ChangeLog
index 60c9fd0e..e3db565b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	is set.  This fixes a bug unconsciously reported by Mike Frysinger.
 	* src/files.c (do_lockfile): Plug a couple of memory leaks.
 	* src/files.c (update_poshistory): Plug another memory leak.
+	* src/files.c (close_buffer): Update position history only when
+	the option 'positionlog' is set.
 
 2016-01-26  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (update_poshistory): Do not add directories to the
diff --git a/src/files.c b/src/files.c
index c6b23394..604c7738 100644
--- a/src/files.c
+++ b/src/files.c
@@ -588,7 +588,9 @@ bool close_buffer(bool quiet)
 	return FALSE;
 
 #ifndef DISABLE_HISTORIES
-    update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
+    if (ISSET(POS_HISTORY))
+	update_poshistory(openfile->filename,
+			openfile->current->lineno, xplustabs() + 1);
 #endif
 
     /* Switch to the next file buffer. */