diff --git a/bash_completion b/bash_completion
index 5dbca5df..8e51a10b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -8324,37 +8324,6 @@ _getent()
 } &&
 complete -F _getent getent
 
-# ntpdate(1) completion
-#
-have ntpdate &&
-_ntpdate()
-{
-	local cur prev
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case $prev in
-		-k)
-			_filedir
-			return 0
-			;;
-		-U)
-			COMPREPLY=( $( compgen -u $cur  ) )
-			return 0
-			;;
-	esac
-
-	if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-4 -6 -b -B -d -Q -q -s -u -v -a\
-			-e -k -p -o -r -t' -- $cur ) )
-	else
-		_known_hosts
-	fi
-} &&
-complete -F _ntpdate ntpdate
-
 # sysctl(8) completion
 #
 have sysctl &&
diff --git a/contrib/ntpdate b/contrib/ntpdate
new file mode 100644
index 00000000..3d5f2b34
--- /dev/null
+++ b/contrib/ntpdate
@@ -0,0 +1,33 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for ntpdate
+
+have ntpdate &&
+_ntpdate()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case $prev in
+		-k)
+			_filedir
+			return 0
+			;;
+		-U)
+			COMPREPLY=( $( compgen -u $cur  ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-4 -6 -b -B -d -Q -q -s -u -v -a\
+			-e -k -p -o -r -t' -- $cur ) )
+	else
+		_known_hosts
+	fi
+} &&
+complete -F _ntpdate ntpdate