diff --git a/.gitignore b/.gitignore
index 788b468..80e7271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aeolus-conductor-0.3.0.tar.gz
 /aeolus-conductor-0.4.0-git101cab5693.tar.gz
+/aeolus-conductor-0.4.0-gitb6e37f9738.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index 0ed2d06..1bebb1e 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -1,11 +1,11 @@
 %global app_root %{_datadir}/%{name}
 %global doc_root %{_datadir}/%{name}-doc
 
-%global alphatag git101cab5693
+%global alphatag gitb6e37f9738
 
 Name:     aeolus-conductor
 Version:  0.4.0
-Release:  0.1%{alphatag}%{?dist}%{?extra_release}
+Release:  0.2%{alphatag}%{?dist}%{?extra_release}
 Summary:  The Aeolus Conductor
 
 Group:    Applications/System
@@ -13,18 +13,19 @@ License:  GPLv2+ and MIT and BSD
 URL:      http://aeolusproject.org
 
 # to build source tarball
-# git clone  git://git.fedorahosted.org/aeolus/conductor.git
-# git checkout 101cab56938916e7dd78a13271851af20b08a500
+# git clone git://git.fedorahosted.org/aeolus/conductor.git
+# cd conductor
+# git checkout b6e37f9738747cf848cbc94e3c2dcff819af3092
 # make dist
 # 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) >= 3.0.5
+Requires: rubygem(rails) >= 3.0.7
 Requires: rubygem(haml) >= 3.1
 Requires: rubygem(nokogiri) >= 1.4.0
-Requires: rubygem(will_paginate)
+Requires: rubygem(will_paginate) >= 3.0
 Requires: rubygem(parseconfig)
 Requires: rubygem(authlogic) >= 3.0.2
 Requires: rubygem(deltacloud-client) >= 0.0.9.8
@@ -38,6 +39,7 @@ Requires: rubygem(json)
 Requires: rubygem(rack-restful_submit)
 Requires: rubygem(uuidtools)
 Requires: rubygem(sqlite3)
+Requires: rubygem(fastercsv)
 Requires: rubygem(pg)
 Requires: postgresql
 Requires: postgresql-server
@@ -47,6 +49,9 @@ Requires: ruby-postgres
 # and is accessible in the init script
 Requires: curl
 
+BuildRequires: rubygem(compass) >= 0.10.2
+BuildRequires: rubygem(compass-960-plugin)
+
 BuildArch: noarch
 
 %description
@@ -136,13 +141,14 @@ haml="app/views/hardware_profiles app/views/realm_mappings \
       app/views/quotas app/views/permissions \
       app/views/deployments app/views/pools \
       app/views/instances app/views/user_sessions \
-      app/views/suggested_deployables"
+      app/views/catalog_entries app/views/catalogs"
 html="public"
 ico="public"
 jpg="public/images public/stylesheets/images"
 js="public/javascripts public/javascripts/jquery-svg \
     public/javascripts/jquery.ui-1.8.1 \
-    public/javascripts/jquery.ui-1.8.1/ui/minified"
+    public/javascripts/jquery.ui-1.8.1/ui/minified \
+    public/javascripts/backbone"
 json="spec/fixtures"
 key="features/upload_files"
 opts="spec"
@@ -170,6 +176,12 @@ for filetype in builder css feature gif haml html ico jpg js json key opts png \
     done
 done
 
+# precompile stylesheets
+cd src
+compass compile --output-style compact
+%{__mv} public/stylesheets/compiled %{buildroot}%{app_root}/public/stylesheets/
+cd ..
+
 # misc files
 %{__cp} src/Rakefile %{buildroot}%{app_root}
 %{__cp} src/config.ru %{buildroot}%{app_root}
@@ -291,6 +303,9 @@ fi
 %{app_root}/spec
 
 %changelog
+* Thu Sep 08 2011 Chris Lalancette <clalance@redhat.com> - 0.4.0-2
+- Update to latest upstream to pull in many fixes
+
 * Fri Jul 29 2011 Chris Lalancette <clalance@redhat.com> - 0.4.0-1
 - Update to upstream git commit, to get the rails 3 code
 
diff --git a/sources b/sources
index 46f7bf3..5624151 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d324f416d2867d6e0efe629ca786d870  aeolus-conductor-0.4.0-git101cab5693.tar.gz
+6018c049879d534e47201969dbc9b3a1  aeolus-conductor-0.4.0-gitb6e37f9738.tar.gz