diff --git a/ChangeLog b/ChangeLog
index 4e381c7bc0..5c558e15bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
       servers to choose a circuit. Bugfix on 0.1.2.x.
     - Stop leaking part of the descriptor when we run into a particularly
       unparseable piece of it. Bugfix on 0.1.2.x.
+    - Unmap the extrainfo cache file on exit.
 
   o Minor features (misc):
     - Optionally (if built with -DEXPORTMALLINFO) export the output
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 32c81d3321..2df75874f3 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1952,6 +1952,8 @@ routerlist_free(routerlist_t *rl)
   smartlist_free(rl->old_routers);
   if (routerlist->mmap_descriptors)
     tor_munmap_file(routerlist->mmap_descriptors);
+  if (routerlist->mmap_extrainfo)
+    tor_munmap_file(routerlist->mmap_extrainfo);
   tor_free(rl);
 
   router_dir_info_changed();