diff --git a/CHANGES b/CHANGES
index 6ecf9a62..438127d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,7 @@ bash-completion (2.x)
   * sed usage portability fixes.
   * Fix leaking local variables from various completions.
   * Turn on -o filenames in _filedir on bash >= 4.
+  * Deprecate modules completion, upstream modules >= 3.2.7 ships one.
 
   [ Freddy Vulto ]
   * Added _get_pword() helper function, thanks to Sung Pae (Alioth: #312030)
diff --git a/Makefile.am b/Makefile.am
index d8d96150..50ffc53d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,6 @@ bashcomp_DATA = contrib/abook \
 		contrib/minicom \
 		contrib/mkinitrd \
 		contrib/mock \
-		contrib/modules \
 		contrib/monodevelop \
 		contrib/mplayer \
 		contrib/msynctool \
@@ -152,4 +151,4 @@ profiledir = $(sysconfdir)/profile.d
 profile_DATA = bash_completion.sh
 
 EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) $(profile_DATA) \
-	contrib/_subversion contrib/_yum contrib/_yum-utils
+	contrib/_modules contrib/_subversion contrib/_yum contrib/_yum-utils
diff --git a/contrib/modules b/contrib/_modules
similarity index 95%
rename from contrib/modules
rename to contrib/_modules
index acc4fb6f..33b367c3 100644
--- a/contrib/modules
+++ b/contrib/_modules
@@ -1,3 +1,6 @@
+# Use of this file is deprecated, upstream completion is available in
+# modules >= 3.2.7, use that instead.
+#
 # module completion by Ted Stern <stern@cray.com>
 #
 # Completion for Environment Modules `module' alias.