diff --git a/CONTRIB/ChangeLog b/contrib/ChangeLog
similarity index 100%
rename from CONTRIB/ChangeLog
rename to contrib/ChangeLog
diff --git a/CONTRIB/README b/contrib/README
similarity index 100%
rename from CONTRIB/README
rename to contrib/README
diff --git a/CONTRIB/lisp/org-annotate-file.el b/contrib/lisp/org-annotate-file.el
similarity index 100%
rename from CONTRIB/lisp/org-annotate-file.el
rename to contrib/lisp/org-annotate-file.el
diff --git a/CONTRIB/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el
similarity index 100%
rename from CONTRIB/lisp/org-bookmark.el
rename to contrib/lisp/org-bookmark.el
diff --git a/CONTRIB/lisp/org-depend.el b/contrib/lisp/org-depend.el
similarity index 100%
rename from CONTRIB/lisp/org-depend.el
rename to contrib/lisp/org-depend.el
diff --git a/CONTRIB/lisp/org-elisp-symbol.el b/contrib/lisp/org-elisp-symbol.el
similarity index 100%
rename from CONTRIB/lisp/org-elisp-symbol.el
rename to contrib/lisp/org-elisp-symbol.el
diff --git a/CONTRIB/lisp/org-expiry.el b/contrib/lisp/org-expiry.el
similarity index 100%
rename from CONTRIB/lisp/org-expiry.el
rename to contrib/lisp/org-expiry.el
diff --git a/CONTRIB/lisp/org-id.el b/contrib/lisp/org-id.el
similarity index 100%
rename from CONTRIB/lisp/org-id.el
rename to contrib/lisp/org-id.el
diff --git a/CONTRIB/lisp/org-interactive-query.el b/contrib/lisp/org-interactive-query.el
similarity index 100%
rename from CONTRIB/lisp/org-interactive-query.el
rename to contrib/lisp/org-interactive-query.el
diff --git a/CONTRIB/lisp/org-mairix.el b/contrib/lisp/org-mairix.el
similarity index 100%
rename from CONTRIB/lisp/org-mairix.el
rename to contrib/lisp/org-mairix.el
diff --git a/CONTRIB/lisp/org-man.el b/contrib/lisp/org-man.el
similarity index 100%
rename from CONTRIB/lisp/org-man.el
rename to contrib/lisp/org-man.el
diff --git a/CONTRIB/lisp/org-mew.el b/contrib/lisp/org-mew.el
similarity index 100%
rename from CONTRIB/lisp/org-mew.el
rename to contrib/lisp/org-mew.el
diff --git a/CONTRIB/lisp/org-panel.el b/contrib/lisp/org-panel.el
similarity index 100%
rename from CONTRIB/lisp/org-panel.el
rename to contrib/lisp/org-panel.el
diff --git a/CONTRIB/lisp/org-registry.el b/contrib/lisp/org-registry.el
similarity index 100%
rename from CONTRIB/lisp/org-registry.el
rename to contrib/lisp/org-registry.el
diff --git a/CONTRIB/lisp/org-screen.el b/contrib/lisp/org-screen.el
similarity index 100%
rename from CONTRIB/lisp/org-screen.el
rename to contrib/lisp/org-screen.el
diff --git a/CONTRIB/lisp/org-toc.el b/contrib/lisp/org-toc.el
similarity index 100%
rename from CONTRIB/lisp/org-toc.el
rename to contrib/lisp/org-toc.el
diff --git a/CONTRIB/lisp/org2rem.el b/contrib/lisp/org2rem.el
similarity index 100%
rename from CONTRIB/lisp/org2rem.el
rename to contrib/lisp/org2rem.el
diff --git a/CONTRIB/packages/org-export-freemind-0.1.0/ChangeLog b/contrib/packages/org-export-freemind-0.1.0/ChangeLog
similarity index 100%
rename from CONTRIB/packages/org-export-freemind-0.1.0/ChangeLog
rename to contrib/packages/org-export-freemind-0.1.0/ChangeLog
diff --git a/CONTRIB/packages/org-export-freemind-0.1.0/README b/contrib/packages/org-export-freemind-0.1.0/README
similarity index 100%
rename from CONTRIB/packages/org-export-freemind-0.1.0/README
rename to contrib/packages/org-export-freemind-0.1.0/README
diff --git a/CONTRIB/packages/org-export-freemind-0.1.0/org-export-freemind-install.el b/contrib/packages/org-export-freemind-0.1.0/org-export-freemind-install.el
similarity index 100%
rename from CONTRIB/packages/org-export-freemind-0.1.0/org-export-freemind-install.el
rename to contrib/packages/org-export-freemind-0.1.0/org-export-freemind-install.el
diff --git a/CONTRIB/packages/org-export-freemind-0.1.0/org-export-freemind.el b/contrib/packages/org-export-freemind-0.1.0/org-export-freemind.el
similarity index 100%
rename from CONTRIB/packages/org-export-freemind-0.1.0/org-export-freemind.el
rename to contrib/packages/org-export-freemind-0.1.0/org-export-freemind.el
diff --git a/CONTRIB/scripts/dir2org.zsh b/contrib/scripts/dir2org.zsh
similarity index 100%
rename from CONTRIB/scripts/dir2org.zsh
rename to contrib/scripts/dir2org.zsh
diff --git a/CONTRIB/scripts/org2hpda b/contrib/scripts/org2hpda
similarity index 100%
rename from CONTRIB/scripts/org2hpda
rename to contrib/scripts/org2hpda
diff --git a/doc/org.texi b/doc/org.texi
index 6077c7009..ae75e219e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -459,11 +459,11 @@ Emacs load path.  To do this, add the following line to @file{.emacs}:
 @end example
 
 @noindent
-If you plan to use code from the @file{CONTRIB} subdirectory, do a similar
+If you plan to use code from the @file{contrib} subdirectory, do a similar
 step for this directory:
 
 @example
-(setq load-path (cons "~/path/to/orgdir/CONTRIB/lisp" load-path))
+(setq load-path (cons "~/path/to/orgdir/contrib/lisp" load-path))
 @end example
 
 @b{XEmacs users now need to install the file @file{noutline.el} from