diff --git a/ustr.spec b/ustr.spec
index 8f3bf2d..f7295a9 100644
--- a/ustr.spec
+++ b/ustr.spec
@@ -1,7 +1,25 @@
 
+%define show_all_cmds       1
+%define broken_fed_dbg_opts 1
+
+%if %{show_all_cmds}
+%define policy_cflags_hide HIDE=
+%else
+%define policy_cflags_hide %{nil}
+%endif
+
+%if %{broken_fed_dbg_opts}
+# Variable name explains itself.
+%define policy_cflags_broken DBG_ONLY_BAD_POLICIES_HAVE_THIS_EMPTY_CFLAGS=
+%else
+%define policy_cflags_broken %{nil}
+%endif
+
+%define policy_cflags %{policy_cflags_hide}  %{policy_cflags_broken}
+
 Name: ustr
 Version: 1.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
@@ -68,13 +86,11 @@ Requires: %{name}-debug = %{version}-%{release}
 %patch2 -p1
 
 %build
-# Last variable name explains itself.
-make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" HIDE= \
-     DBG_ONLY_BAD_POLICIES_HAVE_THIS_EMPTY_CFLAGS=
+make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
 
 %check
 %if %{?chk}%{!?chk:1}
-make check HIDE=
+make check %{policy_cflags}
 %endif
 
 %install
@@ -130,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 28 2007 James Antill <jantill@redhat.com> - 1.0.1-6
+- Add options for fedora policy brokeness, so it's easy to undo.
+- Rebuild for buildid.
+
 * Wed Aug  8 2007 James Antill <james@and.org> - 1.0.1-5
 - Import fix for ustr-import, wrt. repl <=> replace