diff --git a/aeolus-all.spec b/aeolus-all.spec
index 0e296d2..c631493 100644
--- a/aeolus-all.spec
+++ b/aeolus-all.spec
@@ -1,8 +1,6 @@
-%global alphatag gitb6e37f9738
-
 Name:		aeolus-all
 Version:	0.4.0
-Release:	0.2%{alphatag}%{?dist}%{?extra_release}
+Release:	1%{?dist}
 Summary:	A meta-package to pull in all components for Aeolus
 
 Group:		Applications/Internet
@@ -11,20 +9,21 @@ URL:		http://aeolusproject.org
 
 Requires:	aeolus-conductor-daemons = %{version}-%{release}
 Requires:	aeolus-conductor-doc = %{version}-%{release}
-Requires:	condor-deltacloud-gahp
 Requires:	iwhd
 Requires:	aeolus-configure
 Requires:	imagefactory
+Requires:	imagefactory-jeosconf-ec2-fedora
+Requires:	imagefactory-jeosconf-ec2-rhel
 Requires:	qpid-cpp-server
 Requires:	rubygem(aeolus-image)
+Requires:	rubygem(aeolus-cli)
 Requires:	mongodb-server
 Requires:	mod_ssl
 Requires:	deltacloud-core
+Requires:	deltacloud-core-ec2
+Requires:	deltacloud-core-rhevm
+Requires:	deltacloud-core-vsphere
 Requires:	ntp
-# FIXME: this Requires doesn't actually belong here, it belongs in
-# deltacloud-core.  We leave it in until deltacloud-core is fixed
-Requires:	rubygem(aws)
-Requires:	rubygem(rbvmomi)
 
 BuildArch: noarch
 
@@ -38,6 +37,9 @@ run aeolus-configure to configure everything.
 %post
 
 %changelog
+* Wed Oct 12 2011 Scott Seago <sseago@redhat.com> - 0.4.0-1
+- Update to 0.4.0 upstream release
+
 * Thu Sep 08 2011 Chris Lalancette <clalance@redhat.com> - 0.4.0-0.2gitb6e37f9738
 - Update to 0.4.0 git tag b6e37f9738 for compatibility with conductor