diff --git a/Makefile b/Makefile
index eb0a3d162..459487075 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,7 @@ LISPF      = 	org.el			\
 		org-footnote.el		\
 		org-freemind.el		\
 		org-gnus.el		\
+		org-eshell.el		\
 		org-habit.el		\
 		org-html.el		\
 		org-icalendar.el	\
diff --git a/contrib/lisp/org-eshell.el b/lisp/org-eshell.el
similarity index 98%
rename from contrib/lisp/org-eshell.el
rename to lisp/org-eshell.el
index c489bb878..5486b1e0e 100644
--- a/contrib/lisp/org-eshell.el
+++ b/lisp/org-eshell.el
@@ -4,7 +4,7 @@
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
 ;; Version: 0.1
 ;;
-;; This file is not part of GNU Emacs.
+;; This file is part of GNU Emacs.
 ;;
 ;; Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@
       (org-store-link-props
        :link (org-make-link "eshell:" link)
        :description command))))
-  
 
 (provide 'org-eshell)