diff --git a/README.md b/README.md
index 1e68b996f..741306d0d 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ options have yet to be added.
 Then edit `ans.txt` as appropriate e.g.
 
 - set `CONFIG_SSH_KEY` to a public ssh key to be installed to remote machines
-- Edit the IP address to anywhere you want to install a piece of openstack on another server
+- Edit the IP address to anywhere you want to install a piece of OpenStack on another server
 - Edit the 3 network interfaces to whatever makes sense in your setup
 
 you'll need to use a icehouse repository for example for RHEL
@@ -44,7 +44,7 @@ you'll need to use a icehouse repository for example for RHEL
 
     $ packstack
 
-that's it, if everything went well you can now start using openstack
+that's it, if everything went well you can now start using OpenStack
 
     $ cd
     $ . keystonerc_admin
diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
index 0c25f362d..d1ee07d32 100644
--- a/packstack/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -309,7 +309,7 @@ def initSequences(controller):
         return
 
     if controller.CONF['CONFIG_NEUTRON_INSTALL'] == 'y':
-        network_title = ('Adding Openstack Network-related '
+        network_title = ('Adding OpenStack Network-related '
                          'Nova manifest entries')
         network_function = create_neutron_manifest
     else:
@@ -374,7 +374,7 @@ def bring_up_ifcfg(host, device):
             server.execute()
         except ScriptRuntimeError:
             msg = ('Failed to bring up network interface %s on host %s.'
-                   ' Interface should be up so Openstack can work'
+                   ' Interface should be up so OpenStack can work'
                    ' properly.' % (device, host))
             raise ScriptRuntimeError(msg)
 
diff --git a/setup.py b/setup.py
index bcc6b071d..b020f846b 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ setup(
     version=version.version_string(),
     author="Derek Higgins",
     author_email="derekh@redhat.com",
-    description=("A utility to install openstack"),
+    description=("A utility to install OpenStack"),
     license="ASL 2.0",
     keywords="openstack",
     url="https://github.com/stackforge/packstack",
diff --git a/spec/openstack-packstack.spec b/spec/openstack-packstack.spec
deleted file mode 100644
index c01897c73..000000000
--- a/spec/openstack-packstack.spec
+++ /dev/null
@@ -1,81 +0,0 @@
-
-%global git_revno %GIT_REVNO%
-
-Name:           openstack-packstack
-Version:        2012.2.2
-#Release:       1%{?dist}
-Release:        0.1.dev%{git_revno}%{?dist}
-Summary:        Openstack Install Utility
-
-Group:          Applications/System
-License:        ASL 2.0
-URL:            https://github.com/fedora-openstack/packstack
-#Source0:        https://github.com/downloads/fedora-openstack/packstack/packstack-%{version}.tar.gz
-Source0:        https://github.com/downloads/fedora-openstack/packstack/packstack-%{version}dev%{git_revno}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-%if 0%{?rhel}
-BuildRequires:  python-sphinx10
-%else
-BuildRequires:  python-sphinx
-%endif
-
-Requires:       openssh-clients
-
-%description
-Packstack is a utility that uses puppet modules to install openstack
-packstack can be used to deploy various parts of openstack on multiple
-pre installed servers over ssh. It does this be using puppet manifests to
-apply puppet labs modules (https://github.com/puppetlabs/)
-
-%prep
-#%setup -n packstack-%{version}
-%setup -n packstack-%{version}dev%{git_revno}
-
-# Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
-find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} \;
-find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} \; -exec chmod -x {} \;
-find packstack/puppet/modules \( -name "*.sh" \) -exec sed -i 's/^#!.*/#!\/bin\/bash/g' {} \; -exec chmod +x {} \;
-find packstack/puppet/modules -name site.pp -size 0 -exec rm {} \;
-
-# Moving this data directory out temporarily as it causes setup.py to throw errors
-rm -rf %{_builddir}/puppet
-mv packstack/puppet %{_builddir}/puppet
-
-%build
-# puppet on fedora already has this module, using this one causes problems
-%if 0%{?fedora}
-    rm -rf %{_builddir}/puppet/modules/create_resources
-%endif
-
-%{__python} setup.py build
-
-cd docs
-%if 0%{?rhel}
-make man SPHINXBUILD=sphinx-1.0-build
-%else
-make man
-%endif
-
-%install
-%{__python} setup.py install --skip-build --root %{buildroot}
-mv %{_builddir}/puppet %{buildroot}/%{python_sitelib}/packstack/puppet
-
-mkdir -p %{buildroot}%{_mandir}/man1
-install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
-
-%files
-%doc LICENSE
-%{_bindir}/packstack
-%{python_sitelib}/packstack
-%{python_sitelib}/packstack-%{version}*.egg-info
-%{_mandir}/man1/packstack.1.gz
-
-%changelog
-
-* Thu Dec 06 2012 Derek Higgins <derekh@redhat.com>
-- Not keeping change log here, see downstream distributions for actual packaging
-