diff --git a/glibc-cs-path.patch b/glibc-cs-path.patch
new file mode 100644
index 0000000..982f8ff
--- /dev/null
+++ b/glibc-cs-path.patch
@@ -0,0 +1,6 @@
+diff -pruN a/sysdeps/unix/confstr.h b/sysdeps/unix/confstr.h
+--- a/sysdeps/unix/confstr.h	2012-12-25 08:32:13.000000000 +0530
++++ b/sysdeps/unix/confstr.h	2014-09-05 20:02:55.698275219 +0530
+@@ -1 +1 @@
+-#define	CS_PATH	"/bin:/usr/bin"
++#define	CS_PATH	"/usr/bin"
diff --git a/glibc.spec b/glibc.spec
index 32eec5c..f0720ce 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -197,6 +197,10 @@ Patch0050: %{name}-rh1124987.patch
 # Disable rwlock elision if --enable-lock-elision is not used.
 Patch0052: %{name}-disable-rwlock-elision.patch
 
+# confstr _CS_PATH should only return /usr/bin on Fedora since /bin is just a
+# symlink to it.
+Patch0053: %{name}-cs-path.patch
+
 ##############################################################################
 #
 # Patches from upstream
@@ -571,6 +575,7 @@ package or when debugging this package.
 %patch0050 -p1
 %patch0052 -p1
 %patch2035 -p1
+%patch0053 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1724,6 +1729,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Nov 05 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-8
+- Make getconf return only /usr/bin (#1138835).
+
 * Tue Nov 04 2014 Arjun Shankar <arjun.is@lostca.se> - 2.20.90-7
 - Add patch that modifies several tests to use test-skeleton.c.
   The patch is accepted but not yet committed upstream.