diff --git a/.gitignore b/.gitignore
index 0738a5c..ca2c743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 irqbalance-0.55.tar.gz
 irqbalance-0.56.tbz2
+/irqbalance-1.0.tbz2
diff --git a/irqbalance.1 b/irqbalance.1
deleted file mode 100644
index 53e5001..0000000
--- a/irqbalance.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "IRQBALANCE" 1 "Dec 2006" "Linux" "irqbalance"
-.SH NAME
-irqbalance \- distribute hardware interrupts across processors on a multiprocessor system
-.SH "SYNOPSIS"
-
-.nf
-\fBirqbalance\fR 
-.fi
-
-.SH "DESCRIPTION"
-
-.PP
-The purpose of \fBirqbalance\fR is distribute hardware interrupts across processors on a multiprocessor system in order to increase performance\&.
-
-.SH "OPTIONS"
-
-.TP
-.B --oneshot
-Causes irqbalance to be run once, after which the daemon exits
-.TP
-
-.B --debug
-Causes irqbalance to run in the foreground and extra debug information to be printed
-
-.SH "ENVIRONMENT VARIABLES"
-.TP
-.B IRQBALANCE_ONESHOT
-Same as --oneshot
-
-.TP
-.B IRQBALANCE_DEBUG
-Same as --debug
-
-.TP
-.B IRQBALANCE_BANNED_CPUS
-Provides a mask of cpus which irqbalance should ignore and never assign interrupts to
-
-.SH "NOTES"
-The purpose of irqbalance is to distribute interrupts accross cpus in an smp
-system such that cache-domain affinity is maximized for each irq.  In other
-words, irqbalance tries to assign irqs to cpu cores such that each irq stands a
-greater chance of having its interrupt handler be in cache when the irq is
-asserted to the cpu.  This raises a few interesting cases in which the behavior
-of irqbalance may be non-intuitive.  Most notably, cases in which a system has
-only one cache domain.  Nominally these systems are only single cpu
-environments, but can also be found in multi-core environments in which the
-cores share an L2 cache.  In these situations irqbalance will exit immediately,
-since there is no work that irqbalance can do which will improve interrupt
-handling performance.  This is normal and not cause for concern.  For more
-information regarding irqbalance, please visit http://irqbalance.org/
diff --git a/irqbalance.service b/irqbalance.service
deleted file mode 100644
index f349616..0000000
--- a/irqbalance.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=irqbalance daemon
-After=syslog.target
-
-[Service]
-EnvironmentFile=/etc/sysconfig/irqbalance
-Type=forking
-ExecStart=/usr/sbin/irqbalance $ONESHOT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/irqbalance.spec b/irqbalance.spec
index 736d1bf..6f862ee 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,6 +1,6 @@
 Name:           irqbalance
-Version:        0.56
-Release:        4%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Epoch:          2
 Summary:        IRQ balancing daemon
 
@@ -8,9 +8,7 @@ Group:          System Environment/Base
 License:        GPLv2
 Url:            http://irqbalance.org/
 Source0:        http://irqbalance.googlecode.com/files/irqbalance-%{version}.tbz2
-Source1:        irqbalance.service
-Source2:        irqbalance.sysconfig
-Source3:        irqbalance.1
+Source1:        irqbalance.sysconfig
 
 BuildRequires:  autoconf automake libtool libcap-ng
 BuildRequires:  glib2-devel pkgconfig imake libcap-ng-devel
@@ -26,9 +24,7 @@ irqbalance is a daemon that evenly distributes IRQ load across
 multiple CPUs for enhanced performance.
 
 %prep
-%setup -q
-
-sed -i s/-Os//g Makefile
+%setup -q -n irqbalance
 
 %build
 sh ./autogen.sh
@@ -37,11 +33,11 @@ CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
 install -D -p -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
-install -D -p -m 0644 %{SOURCE1} %{buildroot}/lib/systemd/system/irqbalance.service
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -D -p -m 0644 ./misc/irqbalance.service %{buildroot}/lib/systemd/system/irqbalance.service
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 install -d %{buildroot}%{_mandir}/man1/
-install -p -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/
+install -p -m 0644 ./irqbalance.1 %{buildroot}%{_mandir}/man1/
 
 %files
 %defattr(-,root,root)
@@ -78,6 +74,9 @@ fi
 /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 12 2011 Neil Horman <nhorman@redhat.com> - 2:1.0-1
+- Update irqbalance to latest upstream version
+
 * Fri May  6 2011 Bill Nottingham <notting@redhat.com> - 2:0.56-4
 - fix upgrade trigger
 
diff --git a/sources b/sources
index 8532b5d..1803734 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd0c4d3b2bb84778a04fc594ad83949a  irqbalance-0.56.tbz2
+4f6f060b0006bd063fc76886a7d42939  irqbalance-1.0.tbz2