diff --git a/.cvsignore b/.cvsignore
index 92a5043..0a5ba6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-powerman-1.0.24.tar.bz2
-powerman-1.0.25.tar.bz2
+powerman-2.1.tar.bz2
diff --git a/powerman.spec b/powerman.spec
index 57e8d0b..bc3b3c9 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -1,20 +1,23 @@
 Name: powerman
-Version: 1.0.25
-Release: 2%{?dist}
-Summary: PowerMan - Power to the Cluster 
+Version: 2.1
+Release: 1%{?dist}
+Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
 License: GPL
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch1: powerman-1.0.25-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: flex bison
-%if "%{?fedora}" <= "6"
-BuildRequires:  tcp_wrappers
+BuildRequires: flex bison readline-devel
+BuildRequires: tcp_wrappers-devel
+
+%if 0%{?fedora} >= 9
+BuildRequires: libcurl-devel
+BuildRequires: ncurses-devel
 %else
-BuildRequires:  tcp_wrappers-devel
+BuildRequires: curl-devel
+BuildRequires: libtermcap-devel
 %endif
 
 %description
@@ -24,10 +27,9 @@ Expect-like configurability simplifies the addition of new devices.
 
 %prep
 %setup -q
-# Honor $RPM_OPT_FLAGS
-%patch1 -p1 -b .optflags
 
 %build
+%configure --with-httppower --with-genders
 # parallel makes often fail
 make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS"
 
@@ -44,7 +46,7 @@ cp examples/%{name}.conf-small \
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/*
 # Don't turn on by default
 %{__perl} -pi -e 's|chkconfig:.*95 5|chkconfig: - 95 5|g' \
-    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+    $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,12 +73,37 @@ fi
 %{_bindir}/powerman
 %{_bindir}/pm
 %{_sbindir}/powermand
+%{_sbindir}/httppower
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_mandir}/man*/*
-%{_initrddir}/%{name}
+%{_sysconfdir}/init.d/%{name}
 
 %changelog
+* Wed Jun 18 2008 Steven Parrish <smparrish[at]shallowcreek.net> 2.1-1
+- New upstream release
+
+* Wed Jun 04 2008 Jarod Wilson <jwilson@redhat.com> 2.0-2
+- Clean up some legacy distro cruft
+
+* Wed Jun 04 2008 Jarod Wilson <jwilson@redhat.com> 2.0-1
+- New upstream release
+
+* Wed Feb 13 2008 Jarod Wilson <jwilson@redhat.com> 1.0.32-5
+- Fix up header includes to build w/gcc 4.3
+
+* Thu Jan 31 2008 Jarod Wilson <jwilson@redhat.com> 1.0.32-4
+- And now make it build with ncurses instead of termcap in f9+
+
+* Mon Jan 28 2008 Jarod Wilson <jwilson@redhat.com> 1.0.32-3
+- Ugh, add libtermcap-devel BR
+
+* Mon Jan 28 2008 Jarod Wilson <jwilson@redhat.com> 1.0.32-2
+- Add {lib,}curl-devel and readline-devel BR
+
+* Mon Jan 28 2008 Jarod Wilson <jwilson@redhat.com> 1.0.32-1
+- New upstream release
+
 * Wed Feb 07 2007 Jarod Wilson <jwilson@redhat.com> 1.0.25-2
 - Release bump to fix devel upgrade path
 
diff --git a/sources b/sources
index 55710e3..25eff7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22af8e73d79cb7810e3b0ae3b1c16564  powerman-1.0.25.tar.bz2
+45499604a413dcfe48ac7e9f21e61be4  powerman-2.1.tar.bz2