diff --git a/files/rpms/ceilometer-collector b/files/rpms/ceilometer-collector
index c5c855c0d2..d7b7ea89c1 100644
--- a/files/rpms/ceilometer-collector
+++ b/files/rpms/ceilometer-collector
@@ -1,2 +1,3 @@
+selinux-policy-targeted
 mongodb-server
 pymongo
diff --git a/lib/ceilometer b/lib/ceilometer
index 8772867d35..c04371df56 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -88,9 +88,20 @@ function configure_ceilometer() {
     iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
     iniset $CEILOMETER_CONF keystone_authtoken signing_dir $CEILOMETER_AUTH_CACHE_DIR
 
+    configure_mongodb
+
     cleanup_ceilometer
 }
 
+function configure_mongodb() {
+    if is_fedora ; then
+        # ensure smallfiles selected to minimize freespace requirements
+        sudo sed -i '/--smallfiles/!s/OPTIONS=\"/OPTIONS=\"--smallfiles /' /etc/sysconfig/mongod
+
+        restart_service mongod
+    fi
+}
+
 # init_ceilometer() - Initialize etc.
 function init_ceilometer() {
     # Create cache dir