diff --git a/.gitignore b/.gitignore
index 090442b..cfc470a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,5 @@ glibc-2.14-394-g8f3b1ff
 /glibc-2.16.90-c30e8edf.tar.gz
 /glibc-2.16.90-54a41734-fedora.tar.gz
 /glibc-2.16.90-54a41734.tar.gz
+/glibc-2.16.90-2a0e2669-fedora.tar.gz
+/glibc-2.16.90-2a0e2669.tar.gz
diff --git a/glibc-rh864820.patch b/glibc-rh864820.patch
deleted file mode 100644
index 7f4f355..0000000
--- a/glibc-rh864820.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -rup glibc-2.16.90-c30e8edf/localedata/locales/mr_IN glibc-2.16.90-c30e8edf_mod/localedata/locales/mr_IN
---- glibc-2.16.90-c30e8edf/localedata/locales/mr_IN	2012-10-05 18:52:36.000000000 +0530
-+++ glibc-2.16.90-c30e8edf_mod/localedata/locales/mr_IN	2012-10-10 14:23:44.594100194 +0530
-@@ -109,7 +109,7 @@ abday       "<U0930><U0935><U093F>";"<U0
- day         "<U0930><U0935><U093F><U0935><U093E><U0930>";/
-             "<U0938><U094B><U092E><U0935><U093E><U0930>";/
-             "<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";/
--            "<U092E><U0902><U0917><U0933><U0935><U093E><U0930>";/
-+            "<U092C><U0941><U0927><U0935><U093E><U0930>";/
-             "<U0917><U0941><U0930><U0941><U0935><U093E><U0930>";/
-             "<U0936><U0941><U0915><U094D><U0930><U0935><U093E><U0930>";/
-             "<U0936><U0928><U093F><U0935><U093E><U0930>"
-@@ -122,9 +122,9 @@ abmon       "<U091C><U093E><U0928><U0947
-             "<U092E><U0947>";/
-             "<U091C><U0942><U0928>";/
-             "<U091C><U0941><U0932><U0948>";/
--            "<U0913><U0917><U0938><U094D><U091F>";/
--            "<U0938><U0947><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
--            "<U0913><U0915><U094D><U091F><U094B><U092C><U0930>";/
-+            "<U0911><U0917><U0938><U094D><U091F>";/
-+            "<U0938><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
-+            "<U0911><U0915><U094D><U091F><U094B><U092C><U0930>";/
-             "<U0928><U094B><U0935><U094D><U0939><U0947><U0902><U092C><U0930>";/
-             "<U0921><U093F><U0938><U0947><U0902><U092C><U0930>"
- %
-@@ -136,9 +136,9 @@ mon         "<U091C><U093E><U0928><U0947
-             "<U092E><U0947>";/
-             "<U091C><U0942><U0928>";/
-             "<U091C><U0941><U0932><U0948>";/
--            "<U0913><U0917><U0938><U094D><U091F>";/
--            "<U0938><U0947><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
--            "<U0913><U0915><U094D><U091F><U094B><U092C><U0930>";/
-+            "<U0911><U0917><U0938><U094D><U091F>";/
-+            "<U0938><U092A><U094D><U091F><U0947><U0902><U092C><U0930>";/
-+            "<U0911><U0915><U094D><U091F><U094B><U092C><U0930>";/
-             "<U0928><U094B><U0935><U094D><U0939><U0947><U0902><U092C><U0930>";/
-             "<U0921><U093F><U0938><U0947><U0902><U092C><U0930>"
- %
diff --git a/glibc.spec b/glibc.spec
index 0d07fb3..71802e6 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.16.90-54a41734
+%define glibcsrcdir glibc-2.16.90-2a0e2669
 %define glibcversion 2.16.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -27,7 +27,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 24%{?dist}
+Release: 25%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -181,8 +181,6 @@ Patch2027: %{name}-rh819430.patch
 # See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
 Patch2028: %{name}-rh767693-2.patch
 
-Patch2057: %{name}-rh864820.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
 Obsoletes: nss_db
@@ -462,7 +460,6 @@ package or when debugging this package.
 %patch0054 -p1
 %patch0055 -p1
 %patch0056 -p1
-%patch2057 -p1
 
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1257,6 +1254,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Oct 22 2012 Jeff Law <law@redhat.com> - 2.16.90-25
+  - Rsync with upstream sources
+  - Drop 864820 patch as now that it's upstream.
+  - Add sss to /etc/nsswitch.conf (#867473)
+
 * Thu Oct 11 2012 Jeff Law <law@redhat.com> - 2.16.90-24
   - Rsync with upstream sources
   - Drop local 552960-2 patch now that it's upstream.
diff --git a/sources b/sources
index dd33f77..3e7142d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7cbd47d13972f3c11ad3f5ab1c22d4d7  glibc-2.16.90-54a41734-fedora.tar.gz
-cd3e0a870c7a960385978c0b6e77ec54  glibc-2.16.90-54a41734.tar.gz
+d544d61f189c242cb117bb29d9cde3b2  glibc-2.16.90-2a0e2669-fedora.tar.gz
+03ece61a2fe35089fcb68cadf2ea2253  glibc-2.16.90-2a0e2669.tar.gz