diff --git a/bash-completion-manpath.patch b/bash-completion-manpath.patch
new file mode 100644
index 0000000..fc8b39d
--- /dev/null
+++ b/bash-completion-manpath.patch
@@ -0,0 +1,14 @@
+diff --git a/completions/man b/completions/man
+--- a/completions/man
++++ b/completions/man
+@@ -53,9 +53,7 @@ _man()
+         return
+     fi
+ 
+-    local manpath="$MANPATH"
+-    [[ -z $manpath ]] && \
+-        manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
++    local manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
+     [[ -z $manpath ]] && manpath="/usr/share/man:/usr/local/share/man"
+ 
+     # determine manual section to search
diff --git a/bash-completion.spec b/bash-completion.spec
index ac9a6e7..2d6b6cc 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -5,7 +5,7 @@
 
 Name:           bash-completion
 Version:        2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -16,7 +16,8 @@ Source0:        https://github.com/scop/bash-completion/releases/download/%{vers
 Patch0:         %{name}-1.99-noblacklist.patch
 # It should be removed while rebasing to bash-completion-2.8
 Patch1:         %{name}-rfkill.patch
-
+# It should be removed while rebasing to bash-completion-2.8
+Patch2:         %{name}-manpath.patch
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  dejagnu
@@ -92,6 +93,10 @@ make -C completions check
 
 
 %changelog
+* Wed Mar 14 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-4
+- Do not use $MANPATH directly
+  Resolves: #1495055
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild