diff --git a/python-libmount.changes b/python-libmount.changes
index 3d10eab..d711a89 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
+
+- Remove incorrect --with-bashcompletiondir that breaks
+  bash-completion, use path in bash-completion.pc instead
+  (boo#977259).
+
 -------------------------------------------------------------------
 Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 
diff --git a/python-libmount.spec b/python-libmount.spec
index 2c8989c..59d4ee1 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -75,6 +75,7 @@ Summary:        %main_summary
 License:        GPL-2.0+
 Group:          %main_group
 BuildRequires:  audit-devel
+BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
-  --with-bashcompletiondir=%{_datadir}/bash-completion \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1131,13 +1131,11 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
-# FIXME: Fix directory ownership.
-%dir %{_datadir}/bash-completion
-%{_datadir}/bash-completion/*
+%{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
-%exclude %{_datadir}/bash-completion/logger
-%exclude %{_datadir}/bash-completion/lslogins
-%exclude %{_datadir}/bash-completion/uuidd
+%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lslogins
+%exclude %{_datadir}/bash-completion/completions/uuidd
 %endif
 %ifnarch ia64 m68k
 #XXX: post our patches upstream
@@ -1267,8 +1265,8 @@ fi
 /bin/logger
 %{_bindir}/logger
 %{_bindir}/lslogins
-%{_datadir}/bash-completion/logger
-%{_datadir}/bash-completion/lslogins
+%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lslogins
 %{_mandir}/man1/logger.1.gz
 %{_mandir}/man1/lslogins.1.gz
 %{_sbindir}/rcfstrim
@@ -1281,7 +1279,7 @@ fi
 %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
 %ghost %{_localstatedir}/lib/libuuid/clock.txt
 %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
-%{_datadir}/bash-completion/uuidd
+%{_datadir}/bash-completion/completions/uuidd
 %{_mandir}/man8/uuidd.8.gz
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 3d10eab..d711a89 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
+
+- Remove incorrect --with-bashcompletiondir that breaks
+  bash-completion, use path in bash-completion.pc instead
+  (boo#977259).
+
 -------------------------------------------------------------------
 Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index aeea1a7..a182243 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -75,6 +75,7 @@ Summary:        %main_summary
 License:        GPL-2.0+
 Group:          %main_group
 BuildRequires:  audit-devel
+BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
-  --with-bashcompletiondir=%{_datadir}/bash-completion \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1131,13 +1131,11 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
-# FIXME: Fix directory ownership.
-%dir %{_datadir}/bash-completion
-%{_datadir}/bash-completion/*
+%{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
-%exclude %{_datadir}/bash-completion/logger
-%exclude %{_datadir}/bash-completion/lslogins
-%exclude %{_datadir}/bash-completion/uuidd
+%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lslogins
+%exclude %{_datadir}/bash-completion/completions/uuidd
 %endif
 %ifnarch ia64 m68k
 #XXX: post our patches upstream
@@ -1267,8 +1265,8 @@ fi
 /bin/logger
 %{_bindir}/logger
 %{_bindir}/lslogins
-%{_datadir}/bash-completion/logger
-%{_datadir}/bash-completion/lslogins
+%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lslogins
 %{_mandir}/man1/logger.1.gz
 %{_mandir}/man1/lslogins.1.gz
 %{_sbindir}/rcfstrim
@@ -1281,7 +1279,7 @@ fi
 %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
 %ghost %{_localstatedir}/lib/libuuid/clock.txt
 %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
-%{_datadir}/bash-completion/uuidd
+%{_datadir}/bash-completion/completions/uuidd
 %{_mandir}/man8/uuidd.8.gz
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
diff --git a/util-linux.changes b/util-linux.changes
index 3d10eab..d711a89 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
+
+- Remove incorrect --with-bashcompletiondir that breaks
+  bash-completion, use path in bash-completion.pc instead
+  (boo#977259).
+
 -------------------------------------------------------------------
 Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
 
diff --git a/util-linux.spec b/util-linux.spec
index 9147590..78a10de 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -75,6 +75,7 @@ Summary:        %main_summary
 License:        GPL-2.0+
 Group:          %main_group
 BuildRequires:  audit-devel
+BuildRequires:  bash-completion
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
@@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
   --with-ncurses \
   --with-selinux \
   $uhead \
-  --with-bashcompletiondir=%{_datadir}/bash-completion \
   --with-systemdsystemunitdir=%{_unitdir} \
   --enable-libmount-force-mountinfo \
   --enable-sulogin-emergency-mount \
@@ -1131,13 +1131,11 @@ fi
 %dir %{_datadir}/getopt
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
 %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
-# FIXME: Fix directory ownership.
-%dir %{_datadir}/bash-completion
-%{_datadir}/bash-completion/*
+%{_datadir}/bash-completion/completions/*
 %if %build_util_linux_systemd
-%exclude %{_datadir}/bash-completion/logger
-%exclude %{_datadir}/bash-completion/lslogins
-%exclude %{_datadir}/bash-completion/uuidd
+%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lslogins
+%exclude %{_datadir}/bash-completion/completions/uuidd
 %endif
 %ifnarch ia64 m68k
 #XXX: post our patches upstream
@@ -1267,8 +1265,8 @@ fi
 /bin/logger
 %{_bindir}/logger
 %{_bindir}/lslogins
-%{_datadir}/bash-completion/logger
-%{_datadir}/bash-completion/lslogins
+%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lslogins
 %{_mandir}/man1/logger.1.gz
 %{_mandir}/man1/lslogins.1.gz
 %{_sbindir}/rcfstrim
@@ -1281,7 +1279,7 @@ fi
 %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
 %ghost %{_localstatedir}/lib/libuuid/clock.txt
 %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
-%{_datadir}/bash-completion/uuidd
+%{_datadir}/bash-completion/completions/uuidd
 %{_mandir}/man8/uuidd.8.gz
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service