diff --git a/ChangeLog b/ChangeLog
index 4f869a908a..5eac6f03d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* scripts/build-many-glibcs.py (Context.add_all_configs): Add
+	--enable-static-pie variants to x86_64, x32 and i686.
+
 2017-12-19  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #22631]
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index dd4c70d572..b86d6c1387 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -369,6 +369,15 @@ class Context(object):
                                 {'arch': 'i686', 'ccopts': '-m32 -march=i686'}],
                         extra_glibcs=[{'variant': 'disable-multi-arch',
                                        'cfg': ['--disable-multi-arch']},
+                                      {'variant': 'static-pie',
+                                       'cfg': ['--enable-static-pie']},
+                                      {'variant': 'x32-static-pie',
+                                       'ccopts': '-mx32',
+                                       'cfg': ['--enable-static-pie']},
+                                      {'variant': 'static-pie',
+                                       'arch': 'i686',
+                                       'ccopts': '-m32 -march=i686',
+                                       'cfg': ['--enable-static-pie']},
                                       {'variant': 'disable-multi-arch',
                                        'arch': 'i686',
                                        'ccopts': '-m32 -march=i686',