diff --git a/SOURCES/script_list b/SOURCES/script_list
new file mode 100644
index 0000000..0ece830
--- /dev/null
+++ b/SOURCES/script_list
@@ -0,0 +1,478 @@
+abook
+aclocal
+aclocal-1.11
+acpi
+add_members
+alias
+alpine
+alternatives
+animate
+ant
+apache2ctl
+apropos
+apt-build
+apt-cache
+apt-get
+aptitude
+arch
+arm-koji
+arping
+arpspoof
+asciidoc
+asciidoc.py
+aspell
+autoconf
+autoheader
+automake
+automake-1.11
+autoreconf
+autorpm
+autoscan
+autossh
+autoupdate
+avctrl
+a2x
+badblocks
+bk
+brctl
+btdownloadcurses.py
+btdownloadgui.py
+btdownloadheadless.py
+c++
+cancel
+cardctl
+cc
+ccache
+cdrecord
+cfagent
+cfrun
+ci
+ciptool
+civclient
+civserver
+cksfv
+cleanarch
+clisp
+clone_member
+clzip
+co
+colormake
+compare
+compgen
+complete
+composite
+config_list
+configure
+conjure
+convert
+cpan2dist
+cppcheck
+createdb
+crontab
+cryptsetup
+cvs
+cvsps
+dcop
+dd
+declare
+desktop-file-validate
+dfutool
+dhclient
+dict
+display
+dnsspoof
+dot
+dpkg
+dpkg-deb
+dpkg-query
+dpkg-reconfigure
+dpkg-source
+dropdb
+dselect
+dsniff
+dumpdb
+dumpe2fs
+edquota
+eog
+ether-wake
+evince
+explodepkg
+export
+e2freefrag
+e2label
+faillog
+fbgs
+fbi
+feh
+file
+filebucket
+filefrag
+file-roller
+filesnarf
+find_member
+freeciv-gtk2
+freeciv-sdl
+freeciv-server
+freeciv-xaw
+function
+fusermount
+g++
+gcc
+gcj
+gcl
+gdb
+genaliases
+gendiff
+genisoimage
+getent
+gkrellm
+gkrellm2
+gmake
+gmplayer
+gnatmake
+gnome-mplayer
+gnumake
+gpasswd
+gpc
+gpg
+gpg2
+gphoto2
+gprof
+groupmems
+growisofs
+grpck
+g4
+g77
+hciattach
+hciconfig
+hcitool
+hddtemp
+hid2hci
+host
+hping
+hping2
+hping3
+htop
+htpasswd
+change_pw
+check_db
+check_perms
+chkconfig
+chronyc
+chrpath
+iconv
+id
+identify
+idn
+ifdown
+ifstatus
+iftop
+ifup
+import
+info
+inject
+insmod
+insmod.static
+installpkg
+interdiff
+invoke-rc.d
+iperf
+ipmitool
+ipsec
+ipv6calc
+iscsiadm
+isql
+iwconfig
+iwlist
+iwpriv
+iwspy
+jar
+jarsigner
+java
+javac
+javadoc
+javaws
+jps
+kcov
+kill
+killall
+kldload
+kldunload
+koji
+kplayer
+ktutil
+k3b
+larch
+lastlog
+lbzip2
+ldapadd
+ldapcompare
+ldapdelete
+ldapmodify
+ldapmodrdn
+ldappasswd
+ldapsearch
+ldapvi
+ldapwhoami
+lftp
+lftpget
+lilo
+links
+lintian
+lintian-info
+lisp
+list_admins
+list_lists
+list_members
+list_owners
+lpq
+lpr
+lrzip
+lsof
+lua
+luac
+luseradd
+luserdel
+lusermod
+lzip
+lzma
+lzop
+l2ping
+macof
+mailmanctl
+mailsnarf
+make
+makepkg
+man
+mc
+mcrypt
+mdecrypt
+mdtool
+medusa
+mencoder
+mii-diag
+mii-tool
+minicom
+mkinitrd
+mkisofs
+mktemp
+mmsitepass
+modinfo
+modprobe
+mogrify
+monodevelop
+montage
+mount.linux
+mplayer
+mplayer2
+msgsnarf
+msynctool
+mtx
+munindoc
+munin-node-configure
+munin-run
+munin-update
+mussh
+mutt
+muttng
+mysql
+mysqladmin
+nc
+ncftp
+nethogs
+newlist
+newusers
+ngrep
+nmap
+nslookup
+ntpdate
+openssl
+opera
+pack200
+patch
+pbzip2
+pccardctl
+pdlzip
+perl
+perldoc
+pgrep
+phing
+pidof
+pigz
+pine
+pinfo
+ping6
+pkgadd
+pkg-config
+pkg_deinstall
+pkg_delete
+pkg-get
+pkg_info
+pkgrm
+pkgtool
+pkgutil
+pkill
+plague-client
+plzip
+pmake
+pm-hibernate
+pm-is-supported
+pm-powersave
+pm-suspend
+pm-suspend-hybrid
+portinstall
+portupgrade
+postalias
+postcat
+postconf
+postfix
+postmap
+postsuper
+povray
+ppc-koji
+prelink
+protoc
+psql
+puppet
+puppetca
+puppetd
+puppetdoc
+puppetmasterd
+puppetqd
+puppetrun
+pwck
+pwd
+pwdx
+pwgen
+pxz
+pydoc
+pydoc3
+pylint
+python
+python2
+python3
+p4
+qdbus
+qemu
+qrunner
+querybts
+ralsh
+rcs
+rcsdiff
+rdesktop
+rdict
+remove_members
+removepkg
+reportbug
+reptyr
+resolvconf
+rfcomm
+rfkill
+ri
+rlog
+rmlist
+rmmod
+route
+rpcdebug
+rpm
+rpmbuild
+rpmbuild-md5
+rpmcheck
+rpm2targz
+rpm2tgz
+rpm2txz
+rrdtool
+rsync
+sbcl
+sbcl-mt
+sbopkg
+scp
+screen
+sdptool
+sftp
+sh
+sitecopy
+slackpkg
+slapt-get
+slapt-src
+slogin
+smartctl
+smbcacls
+smbclient
+smbcquotas
+smbget
+smbpasswd
+smbtar
+smbtree
+snownews
+sparc-koji
+spovray
+sqlite3
+ss
+ssh-add
+ssh-copy-id
+sshfs
+sshmitm
+sshow
+strace
+stream
+strings
+sudoedit
+svcadm
+svk
+sync_members
+sysbench
+sysctl
+s390-koji
+tar
+tcpkill
+tcpnice
+tightvncviewer
+tracepath
+tracepath6
+tshark
+tune2fs
+typeset
+umount.linux
+unace
+unpack200
+unrar
+unshunt
+update-alternatives
+update-rc.d
+upgradepkg
+urlsnarf
+valgrind
+vigr
+vipw
+vmstat
+vncviewer
+vpnc
+watch
+webmitm
+whatis
+wine
+withlist
+wodim
+wol
+wsimport
+wtf
+wvdial
+xfreerdp
+xgamma
+xhost
+xm
+xmllint
+xmlwf
+xmms
+xmodmap
+xpovray
+xrandr
+xrdb
+xsltproc
+xvnc4viewer
+xxd
+xzdec
+ypcat
+ypmatch
+yum-arch
diff --git a/SPECS/bash-completion.spec b/SPECS/bash-completion.spec
index 4a5dbea..6d1546e 100644
--- a/SPECS/bash-completion.spec
+++ b/SPECS/bash-completion.spec
@@ -5,7 +5,7 @@
 
 Name:           bash-completion
 Version:        2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -15,6 +15,7 @@ Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version
 Source2:        CHANGES.package.old
 # https://bugzilla.redhat.com/677446, see also noblacklist patch
 Source3:        %{name}-2.0-redefine_filedir.bash
+Source4:        script_list
 # https://bugzilla.redhat.com/677446, see also redefine_filedir source
 Patch0:         %{name}-1.99-noblacklist.patch
 # Commands included in util-linux >= 2.23-rc2
@@ -61,6 +62,12 @@ install -pm 644 completions/_udevadm \
 # NetworkManager >= 0.9.8.0 ships this one:
 rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nmcli
 %endif
+%if 0%{?rhel} >= 7
+# remove all completions in file script_list
+for script in $(cat %{SOURCE4}); do
+ rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$script
+done
+%endif
 
 install -Dpm 644 %{SOURCE3} \
     $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/redefine_filedir
@@ -90,6 +97,10 @@ exit $result
 
 
 %changelog
+* Fri Nov 1 2013 Petr Stodulka <pstodulk@redhat.com> - 2.1-6
+- Install only available completions (#810343 - comment 15)
+  without "tar" and remove the other.
+
 * Fri Sep 13 2013 Roman Rakus <rrakus@redhat.com> - 2.1-5
 - Added one more missing conditional
   Resolves: #1007839