diff --git a/irqbalance.init b/irqbalance.init
index 9d59a1c..6ee2663 100755
--- a/irqbalance.init
+++ b/irqbalance.init
@@ -47,7 +47,11 @@ start() {
                 exit 0
         fi
         echo -n $"Starting $prog: "
-        daemon irqbalance $ONESHOT
+	if [ -n "$IRQ_AFFINITY_MASK" ];
+	then
+		IRQ_AFFINITY="--afin_mask $IRQ_AFFINITY_MASK"
+	fi 	
+        daemon irqbalance $ONESHOT $IRQ_AFFINITY
         RETVAL=$?
         echo
         if [ $RETVAL -eq 0 ]; then
diff --git a/irqbalance.spec b/irqbalance.spec
index 256ba99..dfd0e9f 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.13
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -16,6 +16,7 @@ Patch3: irqbalance-classes.patch
 Patch4: irqbalance-oneshot.patch
 Patch5: irqbalance-max-interrupts-increase.patch
 Patch6: irqbalance-multicore.patch
+Patch7: irqbalance-affinty-mask.patch
 
 ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
 Obsoletes:	kernel-utils
@@ -32,6 +33,7 @@ multiple CPUs for enhanced performance.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +81,9 @@ exit 0
 
 
 %changelog
+* Wed Nov 15 2006 Neil Horman <nhorman@redhat.com> - 1.13-8
+- Add ability to set default affinity mask (bz 211148)
+
 * Wed Nov 08 2006 Neil Horman <nhorman@redhat.com> - 1.13-7
 - fix up irqbalance to detect multicore (not ht) (bz 211183)
 
diff --git a/irqbalance.sysconfig b/irqbalance.sysconfig
index 158c3b9..0ff3939 100755
--- a/irqbalance.sysconfig
+++ b/irqbalance.sysconfig
@@ -7,3 +7,12 @@
 #    load and balance it once; after balancing exit and do not change
 #    it again.
 ONESHOT=
+
+#
+# IRQ_AFFINITY_MASK
+#    64 bit bitmask which allows you to indicate which cpu's should
+#    be skipped when reblancing irqs.  Cpu numbers which have their 
+#    corresponding bits set to zero in this mask will not have any
+#    irq's assigned to them on rebalance
+#
+#IRQ_AFFINITY_MASK=