diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 47d768e..c043b2b 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -1,4 +1,8 @@
-# NOTE: This package contains only C header files and pkg-config *.pc files,
+# INFO: When doing a bootstrap build on a new architecture, set this to 1 to
+# avoid build loops.
+%define build_bootstrap 0
+
+# INFO: This package contains only C header files and pkg-config *.pc files,
 # and does not contain any ELF binaries or DSOs, so we disable debuginfo
 # generation.
 %define debug_package %{nil}
@@ -63,7 +67,9 @@ Obsoletes: XFree86-devel, xorg-x11-devel
 # modular X.Org.  Bug #173384.
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
+%if ! %{build_bootstrap}
 Requires: mesa-libGL-devel
+%endif
 
 %description
 X.Org X11 Protocol headers
@@ -276,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Wed Feb 22 2006 Jeremy Katz <katzj@redhat.com> - 7.0-5
+* Wed Feb 22 2006 Jeremy Katz <katzj@redhat.com> 7.0-5
 - require mesa-libGL-devel since it's needed by some of the headers
 
 * Sun Feb 19 2006 Ray Strode <rstrode@redhat.com> 7.0-4