diff --git a/policycoreutils.spec b/policycoreutils.spec
index afb5713..fd0163d 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,13 +1,13 @@
 %define	libauditver	1.4.2-1
 %define libsepolver 	2.0.44-2
-%define	libsemanagever	2.0.46-4
+%define	libsemanagever	2.0.46-6
 %define	libselinuxver	2.0.90-3
 %define	sepolgenver	1.0.23
 
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.86
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -21,6 +21,7 @@ Source5: system-config-selinux.console
 Source6: selinux-polgengui.desktop
 Source7: selinux-polgengui.console
 Source8: policycoreutils_man_ru2.tar.bz2
+Source9: semanage-bash-completion.sh
 Patch:	 policycoreutils-rhat.patch
 Patch1:	 policycoreutils-po.patch
 Patch3:	 policycoreutils-gui.patch
@@ -98,6 +99,8 @@ tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 ln -sf /usr/share/system-config-selinux/polgengui.py %{buildroot}%{_bindir}/selinux-polgengui
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -m 755 %{SOURCE9} %{buildroot}%{_sysconfdir}/bash_completion.d/
 
 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -148,6 +151,8 @@ The policycoreutils-python package contains the management tools use to manage a
 %{_mandir}/man8/sandbox.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
+%dir %{_sysconfdir}/bash_completion.d
+%{_sysconfdir}/bash_completion.d/semanage-bash-completion.sh
 
 %post python
 selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null 
@@ -331,6 +336,9 @@ fi
 exit 0
 
 %changelog
+* Fri Jun 10 2011 Dan Walsh <dwalsh@redhat.com> 2.0.86-13
+- Add semanage-bash-completion.sh script
+
 * Tue Jun 7 2011 Dan Walsh <dwalsh@redhat.com> 2.0.86-12
 - Remove mount -o bind calls from sandbox init script
 - pam_namespace now has this built in.
diff --git a/semanage-bash-completion.sh b/semanage-bash-completion.sh
new file mode 100644
index 0000000..221eae2
--- /dev/null
+++ b/semanage-bash-completion.sh
@@ -0,0 +1,151 @@
+# This file is part of systemd.
+#
+# Copyright 2011 Dan Walsh
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+ALL_OPTS='-l --list -S -o -n --noheading -h --help'
+MANAGED_OPTS='-a --add -m --modify -d --delete -D --deleteall -C --locallist '
+
+__get_all_stores () {
+    dir -1 -F /etc/selinux/ | grep '/' | cut -d'/' -f 1
+}
+__get_all_ftypes () {
+    echo '-- -d -c -b -s -l -p'
+}
+__get_all_users () { 
+    seinfo -u 2> /dev/null | tail -n +3 
+}
+__get_all_types () { 
+    seinfo -t 2> /dev/null | tail -n +3 
+}
+__get_all_port_types () { 
+    seinfo -aport_type -x 2>/dev/null | tail -n +2 
+}
+__get_all_domains () { 
+    seinfo -adomain -x 2>/dev/null | tail -n +2 
+}
+__get_all_node_types () { 
+    seinfo -anode_type -x 2>/dev/null | tail -n +2 
+}
+__get_all_file_types () { 
+    seinfo -afile_type -x 2>/dev/null | tail -n +2 
+}
+__get_all_roles () { 
+    seinfo -t 2> /dev/null | tail -n +3 
+}
+__get_all_stores () {
+    dir -1 -F /etc/selinux/ | grep '/' | cut -d'/' -f 1
+}
+__get_boolean_opts () { echo '$ALL_OPTS --on -off -1 -0 -F' ; }
+__get_user_opts () { echo '$ALL_OPTS $MANAGED_OPTS -L -r -R --role '; }
+__get_login_opts () { echo '$ALL_OPTS $MANAGED_OPTS -s -r '; }
+__get_port_opts () { echo '$ALL_OPTS $MANAGED_OPTS -t -type -r --range -p --proto'; }
+__get_interface_opts () { echo '$ALL_OPTS $MANAGED_OPTS -t --type '; }
+__get_node_opts () { echo '$ALL_OPTS $MANAGED_OPTS -t --type '; }
+__get_fcontext_opts () { echo '$ALL_OPTS $MANAGED_OPTS -t --type -e --equal -f --ftype '; }
+__get_module_opts () { echo '$ALL_OPTS --enable --disable '; }
+__get_dontaudit_opts () { echo '-S on off' ; }
+__get_permissive_opts () { echo '$ALL_OPTS -a --add -d --delete' ; }
+
+_semanage () {
+        local command=${COMP_WORDS[1]}
+        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local verb comps
+        local -A VERBS=(
+	       [LOGIN]='login'
+	       [USER]='user'
+	       [PORT]='port'
+	       [INTERFACE]='interface'
+	       [MODULE]='module'
+	       [NODE]='node'
+	       [FCONTEXT]='fcontext'
+	       [BOOLEAN]='boolean'
+	       [PERMISSIVE]='permissive'
+	       [DONTAUDIT]='dontaudit'
+        )
+
+	if   [ "$prev" = "-a" -a "$command" = "permissive" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_domains ) " -- "$cur") )
+		return 0
+	fi
+	if   [ "$verb" = "" -a "$prev" = "semanage" ]; then
+                comps="${VERBS[*]}"
+	elif [ "$verb" = "" -a "$prev" = "-S" -o "$prev" = "--store" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_stores ) " -- "$cur") )
+		return 0
+	elif [ "$verb" = "" -a "$prev" = "-p" -o "$prev" = "--proto" ]; then
+	        COMPREPLY=( $(compgen -W "tcp udp" -- "$cur") )
+		return 0
+	elif [ "$verb" = "" -a "$prev" = "-r" -o "$prev" = "--roles" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_roles ) " -- "$cur") )
+		return 0
+	elif [ "$verb" = "" -a "$prev" = "-s" -o "$prev" = "--seuser" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_users ) " -- "$cur") )
+		return 0
+	elif [ "$verb" = "" -a "$prev" = "-f" -o "$prev" = "--ftype" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_ftypes ) " -- "$cur") )
+		return 0
+	elif [ "$verb" = "" -a "$prev" = "-t" -o "$prev" = "--types" ]; then
+	    if [ "$command" = "port" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_port_types ) " -- "$cur") )
+		return 0
+	    fi
+	    if [ "$command" = "fcontext" ]; then
+	        COMPREPLY=( $(compgen -W "$( __get_all_file_types ) " -- "$cur") )
+		return 0
+	    fi
+	    COMPREPLY=( $(compgen -W "$( __get_all_types ) " -- "$cur") )
+	    return 0
+        elif __contains_word "$command" ${VERBS[LOGIN]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_login_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[USER]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_user_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[PORT]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_port_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[INTERFACE]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_interface_opts ) " -- "$cur") )
+		return 0p
+        elif __contains_word "$command" ${VERBS[MODULE]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_module_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[NODE]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_node_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[FCONTEXT]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_fcontext_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[BOOLEAN]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_boolean_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[PERMISSIVE]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_permissive_opts ) " -- "$cur") )
+		return 0
+        elif __contains_word "$command" ${VERBS[DONTAUDIT]} ; then
+                COMPREPLY=( $(compgen -W "$( __get_dontaudit_opts ) " -- "$cur") )
+		return 0
+        fi
+        COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+        return 0
+}
+complete -F _semanage semanage