diff --git a/.gitignore b/.gitignore
index 3ae158b..b714ec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ resource-agents-3.0.14.tar.bz2
 /resource-agents-3.0.16.tar.bz2
 /71b1377f907c.tar.bz2
 /resource-agents-3.0.17.tar.bz2
+/resource-agents-3.1.0.tar.xz
diff --git a/resource-agents.spec b/resource-agents.spec
index 92a1643..acd7eed 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,12 +21,12 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.17
+Version: 3.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
-URL: http://sources.redhat.com/cluster/wiki/
-Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
+URL: http://sourceware.org/cluster/wiki/
+Source0: https://fedorahosted.org/releases/r/e/resource-agents/%{name}-%{version}.tar.xz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -104,12 +104,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 %setup -q -n %{name}-%{version} -a 1
 
 # prepare rgmanager RAs
-%{_configure} \
-  --sbindir=%{_sbindir} \
-  --initddir=%{_sysconfdir}/rc.d/init.d \
-  --libdir=%{_libdir} \
-  --without_fence_agents \
-  --disable_kernel_check
+%{_configure}
 
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
@@ -117,14 +112,12 @@ cd %{altprefix}%{altversion}
 %{configure} --enable-fatal-warnings=no --with-rsctmpdir=%{_var}/run/heartbeat/rsctmp
 
 %build
-##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
-# %{_smp_mflags} is broken from upstream and unrequired for this project.
-CFLAGS="$(echo '%{optflags}')" make -C rgmanager/src/resources
+CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 make -C %{altprefix}%{altversion} %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make -C rgmanager/src/resources install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 make -C %{altprefix}%{altversion} install DESTDIR=%{buildroot}
 
 # tree fixup
@@ -152,6 +145,9 @@ find %{buildroot} -name 'ldirectord' -exec rm -f {} \;
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
 
+# remove docs
+rm -rf %{buildroot}/usr/share/doc/resource-agents
+
 %clean
 rm -rf %{buildroot}
 
@@ -205,6 +201,14 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Dec  2 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.0-1
+- new upstream release
+- spec file update:
+  Update upstream URL
+  Update source URL
+  use standard configure macro
+  use standard make invokation
+
 * Thu Oct  7 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.17-1
 - new upstream release
   Resolves: rhbz#632595, rhbz#633856, rhbz#632385, rhbz#628013
diff --git a/sources b/sources
index 508efde..f57d837 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 a3d8f78617099e6e031fec25a1013444  71b1377f907c.tar.bz2
-927c24ca095f75dd306cae591565fdb1  resource-agents-3.0.17.tar.bz2
+4313c74cf1df00c2dbcb02a85bb56fb5  resource-agents-3.1.0.tar.xz