diff --git a/source-highlight.spec b/source-highlight.spec
index c4db661..6628c47 100644
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,14 +1,14 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
 Version: 3.1.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Tools
 License: GPLv3+
 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
 URL: http://www.gnu.org/software/src-highlite/
 BuildRequires: bison, flex, boost-devel
-BuildRequires: help2man, ctags, chrpath
+BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
 Requires(post): info
 Requires(preun): info
 Requires: ctags
@@ -53,6 +53,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
 
 echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
 
+bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
+mkdir -p $RPM_BUILD_ROOT$bashcompdir
+mv $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/source-highlight \
+    $RPM_BUILD_ROOT$bashcompdir/
+rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/source-highlight.info \
@@ -76,8 +82,7 @@ fi
 %{_bindir}/check-regexp
 %{_bindir}/source-highlight-settings
 %{_bindir}/src-hilite-lesspipe.sh
-%dir %{_sysconfdir}/bash_completion.d
-%{_sysconfdir}/bash_completion.d/source-highlight
+%{_datadir}/bash-completion/
 %{_libdir}/libsource-highlight.so.*
 %dir %{_datadir}/source-highlight
 %{_datadir}/source-highlight/*
@@ -92,6 +97,9 @@ fi
 %{_includedir}/srchilite/*.h
 
 %changelog
+* Sat Jan 24 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.1.7-5
+- Install bash completion to %%{_datadir}/bash-completion
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild