diff --git a/conf/pips/general.json b/conf/pips/general.json
new file mode 100644
index 00000000..e3fc43d5
--- /dev/null
+++ b/conf/pips/general.json
@@ -0,0 +1,11 @@
+# This is a extended json package definition file 
+# We allow simple comments (lines starting with a hash symbol)
+{
+    "ubuntu-oneiric": {
+    },
+    "rhel-6": {
+        "coverage": {
+            "version": "3.5.1"
+        }
+    }
+}
diff --git a/conf/pips/horizon.json b/conf/pips/horizon.json
index 278d230f..d25cba0f 100644
--- a/conf/pips/horizon.json
+++ b/conf/pips/horizon.json
@@ -37,6 +37,9 @@
         },
         "sqlalchemy-migrate": {
             "version": "0.7.2"
+        },
+        "python-cloudfiles": {
+            "version": "1.7.9.3"
         }
     }
 }
diff --git a/conf/pkgs/horizon.json b/conf/pkgs/horizon.json
index d3fa9ff3..c9917fd5 100644
--- a/conf/pkgs/horizon.json
+++ b/conf/pkgs/horizon.json
@@ -29,10 +29,6 @@
             "version": "1.12*",
             "removable": true
         },
-        "python-xattr": {
-            "version": "0.6*",
-            "removable": true
-        },
         "python-sqlalchemy": {
             "version": "0.6*",
             "removable": true
@@ -103,12 +99,6 @@
             "removable": true
         },
         # Requires EPEL
-        "python-xattr": {
-            # This might be way to old :(
-            "version": "0.5*",
-            "removable": true
-        },
-        # Requires EPEL
         "python-webob1.0": {
             "version": "1.0*",
             "removable": true
diff --git a/devstack/component.py b/devstack/component.py
index 368d74ed..03c8a78e 100644
--- a/devstack/component.py
+++ b/devstack/component.py
@@ -174,7 +174,7 @@ class PkgInstallComponent(ComponentBase):
                 sh.write_file(tgtfn, contents)
                 self.tracewriter.cfg_write(tgtfn)
         return len(configs)
-        
+
     def _configure_symlinks(self):
         links = self._get_symlinks()
         for (source, link) in links.items():
diff --git a/devstack/components/glance.py b/devstack/components/glance.py
index 8fab5faa..f9182d53 100644
--- a/devstack/components/glance.py
+++ b/devstack/components/glance.py
@@ -73,7 +73,7 @@ BIN_DIR = 'bin'
 REQ_PKGS = ['general.json', 'glance.json']
 
 #pip files that glance requires
-REQ_PIPS = ['glance.json']
+REQ_PIPS = ['general.json', 'glance.json']
 
 
 class GlanceUninstaller(comp.PythonUninstallComponent):
diff --git a/devstack/components/horizon.py b/devstack/components/horizon.py
index 33674779..074b6b8b 100644
--- a/devstack/components/horizon.py
+++ b/devstack/components/horizon.py
@@ -59,7 +59,7 @@ LOG = logging.getLogger("devstack.components.horizon")
 REQ_PKGS = ['general.json', 'horizon.json']
 
 #pip files that horizon requires
-REQ_PIPS = ['horizon.json']
+REQ_PIPS = ['general.json', 'horizon.json']
 
 
 class HorizonUninstaller(comp.PythonUninstallComponent):
diff --git a/devstack/components/keystone.py b/devstack/components/keystone.py
index aa335241..6cb5591d 100644
--- a/devstack/components/keystone.py
+++ b/devstack/components/keystone.py
@@ -60,7 +60,7 @@ APP_OPTIONS = {
 REQ_PKGS = ['general.json', 'keystone.json']
 
 #pip files that keystone requires
-REQ_PIPS = ['keystone.json']
+REQ_PIPS = ['general.json', 'keystone.json']
 
 
 class KeystoneUninstaller(comp.PythonUninstallComponent):
diff --git a/devstack/components/nova.py b/devstack/components/nova.py
index 2f2b7c4c..d024a1d3 100644
--- a/devstack/components/nova.py
+++ b/devstack/components/nova.py
@@ -179,7 +179,7 @@ QUANTUM_OPENSWITCH_OPS = {
 LIBVIRTD_RESTART = ['service', 'libvirtd', 'restart']
 
 #pip files that nova requires
-REQ_PIPS = ['nova.json']
+REQ_PIPS = ['general.json', 'nova.json']
 
 
 class NovaUninstaller(comp.PythonUninstallComponent):