diff --git a/sysfsutils.spec b/sysfsutils.spec
index 9d0283e..c1a1dbd 100644
--- a/sysfsutils.spec
+++ b/sysfsutils.spec
@@ -1,13 +1,15 @@
-Summary: sysfsutils, library interface to sysfs.
-Name: sysfsutils
-Version: 2.0.0
-Release: 6 
-Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}-redhatify.patch
-Patch1: sysfsutils-2.0.0-class-dup.patch
-License: GPL
-Group: Development/Tools
-Buildroot: %{_tmppath}/%{name}-root
+Name:           sysfsutils
+URL:            http://sourceforge.net/projects/linux-diag/
+License:        GPL
+Group:          Development/Tools
+Version:        2.1.0
+Release:        1%{?dist} 
+
+Summary:        sysfsutils and library interface to sysfs
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
+Patch0:         sysfsutils-2.0.0-redhatify.patch
+Patch1:         sysfsutils-2.0.0-class-dup.patch
 
 %description
 This package's purpose is to provide a set of utilities for interfacing
@@ -24,7 +26,7 @@ Library used in handling linux kernel sysfs mounts and their various files.
 %package -n libsysfs-devel
 Summary: Static library and headers for libsysfs
 Group: Development/Libraries
-Requires: libsysfs = %{version}
+Requires: libsysfs = %{version}-%{release}
 Obsoletes: sysfsutils-devel
 
 %description -n libsysfs-devel
@@ -38,15 +40,15 @@ to build programs using the libsysfs API.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-rm -fr %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT/%{_bindir}/dlist_test $RPM_BUILD_ROOT/%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT/%{_bindir}/get_class_dev $RPM_BUILD_ROOT/%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT/%{_bindir}/get_device $RPM_BUILD_ROOT/%{_bindir}/get_driver $RPM_BUILD_ROOT/%{_bindir}/testlibsysfs $RPM_BUILD_ROOT/%{_bindir}/write_attr
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_bindir}/dlist_test $RPM_BUILD_ROOT%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT%{_bindir}/get_class_dev $RPM_BUILD_ROOT%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT%{_bindir}/get_device $RPM_BUILD_ROOT%{_bindir}/get_driver $RPM_BUILD_ROOT%{_bindir}/testlibsysfs $RPM_BUILD_ROOT%{_bindir}/write_attr
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
 
@@ -64,8 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libsysfs
 %defattr(-,root,root)
-%{_libdir}/libsysfs.so.2
-%{_libdir}/libsysfs.so.2.0.0
+%{_libdir}/libsysfs.so.*
 %doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt lib/LGPL
 
 %files -n libsysfs-devel
@@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 29 2007 Jarod Wilson <jwilson@redhat.com> - 2.1.0-1
+- Update to upstream release 2.1.0
+
 * Mon Sep 11 2006 Neil Horman <nhorman@redhat.com> - 2.0.0-6
 - Integrate patch for bz 205808