diff --git a/.gitignore b/.gitignore
index 4d4c980..788b468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /aeolus-conductor-0.3.0.tar.gz
+/aeolus-conductor-0.4.0-git101cab5693.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index 7b076a6..0ed2d06 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -1,9 +1,11 @@
 %global app_root %{_datadir}/%{name}
 %global doc_root %{_datadir}/%{name}-doc
 
+%global alphatag git101cab5693
+
 Name:     aeolus-conductor
-Version:  0.3.0
-Release:  2%{?dist}%{?extra_release}
+Version:  0.4.0
+Release:  0.1%{alphatag}%{?dist}%{?extra_release}
 Summary:  The Aeolus Conductor
 
 Group:    Applications/System
@@ -12,31 +14,31 @@ URL:      http://aeolusproject.org
 
 # to build source tarball
 # git clone  git://git.fedorahosted.org/aeolus/conductor.git
-# git checkout v0.3.0_RC_1
+# git checkout 101cab56938916e7dd78a13271851af20b08a500
 # make dist
-# cp aeolus-conductor-0.0.4.tar.gz ~/rpmbuild/SOURCES
-Source0:    aeolus-conductor-%{version}.tar.gz
+# cp aeolus-conductor-0.4.0.tar.gz ~/rpmbuild/SOURCES
+Source0:    aeolus-conductor-%{version}-%{alphatag}.tar.gz
 
 Requires: ruby >= 1.8.1
 Requires: ruby(abi) = 1.8
-Requires: rubygem(rails) >= 2.1.1
-Requires: rubygem(haml)
+Requires: rubygem(rails) >= 3.0.5
+Requires: rubygem(haml) >= 3.1
 Requires: rubygem(nokogiri) >= 1.4.0
 Requires: rubygem(will_paginate)
 Requires: rubygem(parseconfig)
-Requires: rubygem(authlogic)
+Requires: rubygem(authlogic) >= 3.0.2
 Requires: rubygem(deltacloud-client) >= 0.0.9.8
-Requires: rubygem(compass)
+Requires: rubygem(compass) >= 0.10.2
 Requires: rubygem(compass-960-plugin)
 Requires: rubygem(simple-navigation)
 Requires: rubygem(typhoeus)
-Requires: rubygem(rest-client)
+Requires: rubygem(rest-client) >= 1.6.1
 Requires: rubygem(builder)
 Requires: rubygem(json)
 Requires: rubygem(rack-restful_submit)
-Requires: rubygem(delayed_job)
-Requires: rubygem(net-scp)
 Requires: rubygem(uuidtools)
+Requires: rubygem(sqlite3)
+Requires: rubygem(pg)
 Requires: postgresql
 Requires: postgresql-server
 Requires: ruby-postgres
@@ -80,10 +82,12 @@ Requires: rubygem(cucumber)
 Requires: rubygem(rspec)
 Requires: rubygem(timecop)
 Requires: rubygem(cucumber-rails)
-Requires: rubygem(rspec-rails)
-Requires: rubygem(webrat)
-Requires: rubygem(database_cleaner)
+Requires: rubygem(rspec-rails) >= 2.0.1
+Requires: rubygem(webrat) >= 0.7.2
+Requires: rubygem(database_cleaner) >= 0.5.0
 Requires: rubygem(factory_girl)
+Requires: rubygem(vcr)
+Requires: rubygem(factory_girl_rails)
 
 %description devel
 Tests and other development tools for the Aeolus Conductor.
@@ -121,11 +125,8 @@ getent passwd aeolus >/dev/null || \
 # extension may exist.  For instance cgi="public" means that src/public/*.cgi
 # will be copied from the source into the RPM.
 builder="app/views/errors"
-cgi="public"
 css="public/stylesheets public/stylesheets/jquery.ui-1.8.1 \
      public/javascripts/jquery-svg"
-erb="app/views/layouts"
-fcgi="public"
 feature="features"
 gif="public/images public/stylesheets/images"
 haml="app/views/hardware_profiles app/views/realm_mappings \
@@ -148,12 +149,10 @@ opts="spec"
 png="public/images public/images/icons public/stylesheets/images \
      public/stylesheets/jquery.ui-1.8.1/images"
 rake="lib/tasks"
-rb="app/models app/controllers \
-    app/helpers \
-    app/services app/util \
-    config config/initializers config/environments db db/migrate dutils \
-    features/support features/step_definitions lib public spec \
-    spec/controllers spec/factories spec/helpers spec/models spec/services"
+rb="app/models app/controllers app/helpers app/services app/util config \
+    config/initializers config/environments db db/migrate dutils \
+    features/support features/step_definitions lib spec spec/controllers \
+    spec/factories spec/helpers spec/models spec/services"
 rhtml="app/views/layouts"
 scss="app/stylesheets"
 svg="public/images public/images/icons public/javascripts/jquery-svg"
@@ -161,8 +160,8 @@ ttf="public/fonts"
 txt="public"
 yml="config config/locales"
 
-for filetype in builder cgi css erb fcgi feature gif haml html ico jpg js json \
-    key opts png rake rb rhtml scss svg ttf txt yml; do
+for filetype in builder css feature gif haml html ico jpg js json key opts png \
+    rake rb rhtml scss svg ttf txt yml; do
     dirs=${!filetype}
 
     for dir in $dirs; do
@@ -174,6 +173,7 @@ done
 # misc files
 %{__cp} src/Rakefile %{buildroot}%{app_root}
 %{__cp} src/config.ru %{buildroot}%{app_root}
+%{__cp} src/Gemfile %{buildroot}%{app_root}
 
 %{__mkdir} -p %{buildroot}%{app_root}/config
 %{__cp} src/config/database.pg %{buildroot}%{app_root}/config
@@ -193,7 +193,6 @@ done
 # copy over init scripts and various config
 %{__cp} conf/aeolus-conductor %{buildroot}%{_initrddir}
 %{__cp} conf/conductor-dbomatic %{buildroot}%{_initrddir}
-%{__cp} conf/conductor-delayed_job %{buildroot}%{_initrddir}
 %{__cp} conf/aeolus-conductor-httpd.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/aeolus-conductor.conf
 %{__cp} conf/aeolus-conductor.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/aeolus-conductor
 %{__cp} conf/aeolus-conductor.sysconf %{buildroot}%{_sysconfdir}/sysconfig/aeolus-conductor
@@ -211,7 +210,6 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
 touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
 
 %{__mkdir} -p %{buildroot}%{app_root}/log
-touch %{buildroot}%{app_root}/log/delayed_job.log
 
 # copy script files over
 %{__cp} -r src/script %{buildroot}%{app_root}
@@ -246,7 +244,6 @@ fi
 # Register the services
 /sbin/chkconfig --add aeolus-conductor
 /sbin/chkconfig --add conductor-dbomatic
-/sbin/chkconfig --add conductor-delayed_job
 
 %preun daemons
 if [ $1 = 0 ]; then
@@ -254,8 +251,6 @@ if [ $1 = 0 ]; then
    /sbin/chkconfig --del aeolus-conductor
    /sbin/service conductor-dbomatic stop > /dev/null 2>&1
    /sbin/chkconfig --del conductor-dbomatic
-   /sbin/service conductor-delayed_job stop > /dev/null 2>&1
-   /sbin/chkconfig --del conductor-delayed_job
 fi
 
 %files
@@ -270,14 +265,13 @@ fi
 %{app_root}/log
 %{app_root}/public
 %{app_root}/Rakefile
-%{app_root}/script/delayed_job
+%{app_root}/Gemfile
 %config %{_sysconfdir}/%{name}
 %doc AUTHORS COPYING
 
 %files daemons
 %{_initrddir}/aeolus-conductor
 %{_initrddir}/conductor-dbomatic
-%{_initrddir}/conductor-delayed_job
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/aeolus-conductor
 %config(noreplace) %{_sysconfdir}/sysconfig/conductor-rails
@@ -285,7 +279,6 @@ fi
 %attr(-, aeolus, aeolus) %{_localstatedir}/lib/%{name}
 %attr(-, aeolus, aeolus) %{_localstatedir}/run/%{name}
 %attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
-%attr(-, aeolus, aeolus) %{app_root}/log/delayed_job.log
 %doc AUTHORS COPYING
 
 %files doc
@@ -298,6 +291,9 @@ fi
 %{app_root}/spec
 
 %changelog
+* Fri Jul 29 2011 Chris Lalancette <clalance@redhat.com> - 0.4.0-1
+- Update to upstream git commit, to get the rails 3 code
+
 * Thu Jul 21 2011 Mo Morsi <mmorsi@redhat.com> - 0.3.0-2
 - update Source0 checkout instructions
 
diff --git a/sources b/sources
index 0f6435e..46f7bf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c15afd076702d19913016962005c49fa  aeolus-conductor-0.3.0.tar.gz
+d324f416d2867d6e0efe629ca786d870  aeolus-conductor-0.4.0-git101cab5693.tar.gz