diff --git a/CHANGES b/CHANGES
index 130e02de..202c7911 100644
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,7 @@ bash-completion (1.x)
   * Split ant completion to contrib/ant, improve the built in one.
   * Improve postfix completion.
   * Improve samba completion.
+  * Split lilo completion to contrib/lilo.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/Makefile.am b/Makefile.am
index 5eaa6f87..5f367a7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/larch \
 		contrib/ldapvi \
 		contrib/lftp \
+		contrib/lilo \
 		contrib/lilypond \
 		contrib/lisp \
 		contrib/lzma \
diff --git a/bash_completion b/bash_completion
index 23fb6d38..eeeece6f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4144,61 +4144,6 @@ _rcs()
 } &&
 complete -F _rcs $filenames ci co rlog rcs rcsdiff
 
-# lilo(8) completion
-#
-have lilo && {
-_lilo_labels()
-{
-	COMPREPLY=( $( awk -F'=' '/label/ {print $2}' \
-		/etc/lilo.conf | sed -e 's/"//g' | grep "^$cur" ) )
-}
-
-_lilo()
-{
-	local cur prev
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case $prev in
-		-@(C|i|m|s|S))
-			_filedir
-			return 0
-			;;
-		-r)
-			_filedir -d
-			return 0
-			;;
-		-@(I|D|R))
-			# label completion
-			_lilo_labels
-			return 0
-			;;
-		-@(A|b|M|u|U))
-			# device completion
-			cur=${cur:=/dev/}
-			_filedir
-			return 0
-			;;
-		-T)
-			# topic completion
-			COMPREPLY=( $( compgen -W 'help ChRul EBDA geom geom= \
-					table= video' -- $cur ) )
-			return 0
-			;;
-	esac
-
-	if [[ "$cur" == -* ]]; then
-		# relevant options completion
-		COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m \
-			-M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- \
-			$cur ) )
-	fi
-}
-complete -F _lilo lilo
-}
-
 # links completion
 #
 have links &&
diff --git a/contrib/lilo b/contrib/lilo
new file mode 100644
index 00000000..bd7ef8c0
--- /dev/null
+++ b/contrib/lilo
@@ -0,0 +1,57 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for lilo(8)
+
+have lilo && {
+_lilo_labels()
+{
+	COMPREPLY=( $( awk -F'=' '/label/ {print $2}' \
+		/etc/lilo.conf | sed -e 's/"//g' | grep "^$cur" ) )
+}
+
+_lilo()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case $prev in
+		-@(C|i|m|s|S))
+			_filedir
+			return 0
+			;;
+		-r)
+			_filedir -d
+			return 0
+			;;
+		-@(I|D|R))
+			# label completion
+			_lilo_labels
+			return 0
+			;;
+		-@(A|b|M|u|U))
+			# device completion
+			cur=${cur:=/dev/}
+			_filedir
+			return 0
+			;;
+		-T)
+			# topic completion
+			COMPREPLY=( $( compgen -W 'help ChRul EBDA geom geom= \
+					table= video' -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		# relevant options completion
+		COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m \
+			-M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- \
+			$cur ) )
+	fi
+}
+complete -F _lilo lilo
+}