diff --git a/Makefile.am b/Makefile.am
index 37fa7d6f..4b0b73bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/strace \
 		contrib/_subversion \
 		contrib/svk \
+		contrib/sysctl \
 		contrib/tar \
 		contrib/unace \
 		contrib/unrar \
diff --git a/bash_completion b/bash_completion
index 5feb7652..7d41359f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4821,22 +4821,6 @@ _id()
 } &&
 complete -F _id id
 
-# sysctl(8) completion
-#
-have sysctl &&
-_sysctl()
-{
-	local cur
-
-	COMPREPLY=()
-	cur=`_get_cword`
-
-	COMPREPLY=( $( compgen -W "$(sysctl -N -a 2>/dev/null)" -- $cur ) )
-
-	return 0
-} &&
-complete -F _sysctl sysctl
-
 # update-rc.d(8) completion
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
diff --git a/contrib/sysctl b/contrib/sysctl
new file mode 100644
index 00000000..516fcc11
--- /dev/null
+++ b/contrib/sysctl
@@ -0,0 +1,18 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for sysctl
+
+have sysctl &&
+_sysctl()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=`_get_cword`
+
+	COMPREPLY=( $( compgen -W "$(sysctl -N -a 2>/dev/null)" -- $cur ) )
+
+	return 0
+} &&
+complete -F _sysctl sysctl