diff --git a/.gitignore b/.gitignore
index 488fe6b..7191aeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /imagefactory-0.7.0.tar.gz
 /imagefactory-0.7.0_4_g4897b98.tar.gz
 /imagefactory-0.7.1.tar.gz
+/imagefactory-1.1.1.tar.gz
diff --git a/imagefactory.spec b/imagefactory.spec
index 6b56f56..ed01ca3 100644
--- a/imagefactory.spec
+++ b/imagefactory.spec
@@ -1,7 +1,7 @@
 Summary: System image generation tool
 Name: imagefactory
-Version: 0.7.1
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Source0: http://repos.fedorapeople.org/repos/aeolus/imagefactory/%{version}/tarball/%{name}-%{version}.tar.gz
 License: ASL 2.0
 Group: Applications/System
@@ -9,11 +9,10 @@ URL: http://www.aeolusproject.org/imagefactory.html
 BuildArch: noarch
 Requires: oz >= 0.7.0
 Requires: euca2ools
-Requires: python-qmf
 Requires: python-pycurl
 Requires: python-libguestfs
 Requires: python-zope-interface
-Requires: python-boto
+Requires: python-boto >= 2.0
 Requires: libxml2-python
 Requires: python-httplib2
 Requires: python-argparse
@@ -23,6 +22,10 @@ Requires: VMDKstream
 Requires: python-suds >= 0.4.1
 Requires: python-paste-deploy
 Requires: python-oauth2
+Requires: qemu-img
+# We need this for dc-rhev-image
+# TODO: Remove this requirement when move pushing internal to the factory
+Requires: iwhd >= 1.2
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
@@ -30,9 +33,9 @@ Requires(preun): initscripts
 BuildRequires: python-setuptools
 
 %description
-imagefactory is a daemon that listens for build requests via QMF.  When
-a build request is received, imagefactory will build the requested image
-for the requested target.
+imagefactory allows the creation of system images for multiple virtualization
+and cloud providers from a single template definition. See 
+http://aeolusproject.org/projects/imagefactory for more information.
 
 %package jeosconf-ec2-fedora
 Summary: Configuration for JEOS images for EC2
@@ -59,13 +62,16 @@ python setup.py build
 %install
 python setup.py install -O1 --root=%{buildroot} --skip-build
 
-mkdir -p %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
-mkdir -p %{buildroot}/%{_localstatedir}/lib/imagefactory/images
+%{__install} -d %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
+%{__install} -d %{buildroot}/%{_localstatedir}/lib/imagefactory/images
+%{__install} -d %{buildroot}/%{_sysconfdir}/logrotate.d
 
 sed -i '/\/usr\/bin\/env python/d' %{buildroot}/%{python_sitelib}/imgfac/*.py
 
-cp conf/ec2_fedora_jeos_03_OCT_2011.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
-cp conf/ec2_rhel_jeos_03_OCT_2011.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
+%{__install} conf/ec2_fedora_jeos.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
+%{__install} conf/ec2_rhel_jeos.conf %{buildroot}/%{_sysconfdir}/imagefactory/jeos_images
+%{__install} -m0600 conf/imagefactory.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/imagefactory
+%{__install} -m0600 conf/imagefactory.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/imagefactory
 
 %post
 /sbin/chkconfig --add %{name}
@@ -80,6 +86,8 @@ fi
 %doc COPYING
 %{_initddir}/imagefactory
 %config(noreplace) %{_sysconfdir}/imagefactory/imagefactory.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %attr(0755, root, root) %{_sysconfdir}/pki/imagefactory/
 %dir %attr(0755, root, root) %{_sysconfdir}/imagefactory/jeos_images/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/imagefactory/images
@@ -90,18 +98,12 @@ fi
 %{_mandir}/man1/*
 
 %files jeosconf-ec2-fedora
-%{_sysconfdir}/imagefactory/jeos_images/ec2_fedora_jeos_03_OCT_2011.conf
+%{_sysconfdir}/imagefactory/jeos_images/ec2_fedora_jeos.conf
 
 %files jeosconf-ec2-rhel
-%{_sysconfdir}/imagefactory/jeos_images/ec2_rhel_jeos_03_OCT_2011.conf
+%{_sysconfdir}/imagefactory/jeos_images/ec2_rhel_jeos.conf
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Oct 13 2011 Ian McLeod <imcleod@redhat.com> - 0.7.1-1
-- Incorporate subpackage improvement from clalance@redhat.com
-
 * Thu Sep 15 2011 Ian McLeod <imcleod@redhat.com> - 0.6.1
 - Update Oz requirement to 0.7.0 or later for new target-specific package config
 - Update SPEC file to restart service after an install
diff --git a/sources b/sources
index 0eb7989..bf5daf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91efdd9f2ccae896dab4129461501b04  imagefactory-0.7.1.tar.gz
+b76b8487e2af518d7f2d03aceccc215f  imagefactory-1.1.1.tar.gz