diff --git a/window-numbering.el b/window-numbering.el
index 702c334..f79d9ef 100644
--- a/window-numbering.el
+++ b/window-numbering.el
@@ -37,6 +37,8 @@
 ;;
 ;;; Changes Log:
 ;;
+;;    Fix numbering of minibuffer for recent Emacs versions.
+;;
 ;; 2013-03-23 (1.1.2)
 ;;    Fix numbering in terminal mode with menu bar visible.
 ;;    Add face for window number.  (thanks to Chen Bin)
@@ -202,12 +204,14 @@ windows to numbers."
         (save-excursion
           (setq window-numbering-table (make-hash-table :size 16))
           (window-numbering-install-mode-line)
+          (add-hook 'minibuffer-setup-hook 'window-numbering-update)
           (add-hook 'window-configuration-change-hook
                     'window-numbering-update)
           (dolist (frame (frame-list))
             (select-frame frame)
             (window-numbering-update))))
     (window-numbering-clear-mode-line)
+    (remove-hook 'minibuffer-setup-hook 'window-numbering-update)
     (remove-hook 'window-configuration-change-hook
                  'window-numbering-update)
     (setq window-numbering-table nil)))