diff --git a/conf/pips/horizon.json b/conf/pips/horizon.json
index 57f4e091..dcd8b9e1 100644
--- a/conf/pips/horizon.json
+++ b/conf/pips/horizon.json
@@ -53,5 +53,14 @@
         "django-staticfiles" : {
             "version": "1.1.2"
         }
+    },
+    "fedora-16": {
+        # rpm 1.7.9.1 does not have exceptions.Error
+        "python-cloudfiles": {
+            "version": "1.7.9.3"
+        },
+        "django-nose" : {
+            "version": "0.1.3"
+        }
     }
 }
diff --git a/conf/pkgs/db.json b/conf/pkgs/db.json
index 6dbeb937..772e37a9 100644
--- a/conf/pkgs/db.json
+++ b/conf/pkgs/db.json
@@ -46,5 +46,16 @@
             "version": "5.1*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "mysql-server": {
+            "version": "5.5*",
+            "removable": true
+        },
+        #client pkgs are here
+        "mysql": {
+            "version": "5.5*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/general.json b/conf/pkgs/general.json
index 0eb4cc45..6efff059 100644
--- a/conf/pkgs/general.json
+++ b/conf/pkgs/general.json
@@ -245,5 +245,128 @@
             "removable": false,
             "version": "1.1.26*"
         }
+    },
+    "fedora-16": {
+        "curl": {
+            "removable": false, 
+            "version": "7.21.7*"
+        }, 
+        # Only for testing client
+        "euca2ools": {
+            "removable": false, 
+            # This version is most likely way to old!
+            "version": "1.3.1*"
+        }, 
+        "git": {
+            "removable": false, 
+            "version": "1.7*"
+        }, 
+        "gawk": {
+            "version": "4.0*",
+            "removable": false
+        },
+        "iputils": {
+            "removable": false, 
+            "version": "20101006*"
+        }, 
+        # Useful when debugging
+        "mlocate": {
+            "removable": false, 
+            "version": "0.24*"
+        }, 
+        # Useful when debugging
+        "lsof": {
+            "removable": false, 
+            "version": "4.84*"
+        }, 
+        "openssh-server": {
+            "removable": false, 
+            "version": "5.8*"
+        }, 
+        "python-pep8": {
+            "removable": false, 
+            "version": "0.6*"
+        }, 
+        "psmisc": {
+            "removable": false, 
+            "version": "22.13*"
+        }, 
+        "pylint": {
+            "removable": false, 
+            "version": "0.24*"
+        }, 
+        "python": {
+            "removable": false, 
+            "version": "2.7*"
+        }, 
+        # For testing
+        "python-coverage": {
+            "removable": true, 
+            "version": "3.5*"
+        }, 
+        "python-pip": {
+            "removable": false, 
+            "version": "0.8*"
+        }, 
+        # For testing
+        "python-unittest2": {
+            "removable": false, 
+            "version": "0.5.1*"
+        }, 
+        # For testing
+        "python-virtualenv": {
+            "removable": false, 
+            "version": "1.7*"
+        }, 
+        "python-setuptools": {
+            "version": "0.6.24*",
+            "removable": false
+        },
+        "python-distutils-extra": {
+            "version": "2.29*",
+            "removable": false
+        },
+        "python-devel": {
+            "version": "2.7*",
+            "removable": false
+        },
+        # For testing
+        "python-nose": {
+            "version": "1.1*",
+            "removable": true
+        },
+        # For testing
+        "python-mox": {
+            "version": "0.5.3*",
+            "removable": true
+        },
+        "screen": {
+            "removable": false, 
+            "version": "4.1.0*"
+        }, 
+        "sudo": {
+            "removable": false,
+            "version" : "1.8.3*"
+        },
+        "tcpdump": {
+            "removable": false, 
+            "version": "4.1*"
+        }, 
+        "unzip": {
+            "removable": false, 
+            "version": "6.0*"
+        }, 
+        "wget": {
+            "removable": false, 
+            "version": "1.12*"
+        },
+        "libxml2-devel": {
+            "removable": false,
+            "version": "2.7*"
+        },
+        "libxslt-devel": {
+            "removable": false,
+            "version": "1.1.26*"
+        }
     }
 }
diff --git a/conf/pkgs/glance.json b/conf/pkgs/glance.json
index 50d689a8..f081ec52 100644
--- a/conf/pkgs/glance.json
+++ b/conf/pkgs/glance.json
@@ -95,5 +95,45 @@
             "version": "0.4*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3.1*",
+            "removable": true
+        },
+        "python-argparse": {
+            "version": "1.1*",
+            "removable": true
+        },
+        "MySQL-python": {
+            "version": "1.2*",
+            "removable": true
+        },
+        "python-dateutil": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-prettytable": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "pyxattr": {
+            # This might be way to old :(
+            "version": "0.5*",
+            "removable": true
+        },
+        "python-httplib2": {
+            # This might be way to old :(
+            "version": "0.6*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/horizon.json b/conf/pkgs/horizon.json
index 0cd65091..996cadfa 100644
--- a/conf/pkgs/horizon.json
+++ b/conf/pkgs/horizon.json
@@ -113,5 +113,89 @@
             "version": "0.9*",
             "removable": true
         }
+    },
+    # initially stolen from ubuntu-oneric
+    "fedora-16": {
+        "httpd": {
+            "version": "2.2*",
+            "removable": true
+        },
+        "mod_wsgi": {
+            "version": "3.3*",
+            "removable": true
+        },
+        "python-dateutil": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-paste": {
+            "version": "1.7.5*",
+            "removable": true
+        },
+        "python-paste-deploy": {
+            "version": "1.5.0*",
+            "removable": true
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "pyxattr": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "python-sqlalchemy": {
+            "version": "0.7*",
+            "removable": true
+        },
+        "python-webob": {
+            "version": "1.0*",
+            "removable": true
+        },
+        "python-kombu": {
+            "version": "1.1*",
+            "removable": true
+        },
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-sphinx": {
+            "version": "1.0.7*",
+            "removable": true
+        },
+        "python-cherrypy": {
+            "version": "3.2*",
+            "removable": true
+        },
+        "Django": {
+            "version": "1.3*",
+            "removable": true
+        },
+         # Not packaged yet
+#        "python-django-mailer": {
+#            "version": "0.2*",
+#            "removable": true
+#        },
+        # Is this really needed?
+        # Only in F16 testing repo
+#        "python-django-nose": {
+#            "version": "0.1*",
+#            "removable": true
+#        },
+        "django-registration": {
+            "version": "0.7*",
+            "removable": true
+        },
+        # Is this really needed?
+        # Why is a rackspace api package here?
+        "python-cloudfiles": {
+            "version": "1.7.9*",
+            "removable": true
+        },
+        "python-migrate": {
+            "version": "0.7*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/keystone-client.json b/conf/pkgs/keystone-client.json
index 9ebbbbcb..75220dab 100644
--- a/conf/pkgs/keystone-client.json
+++ b/conf/pkgs/keystone-client.json
@@ -25,5 +25,15 @@
             "version": "0.5*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "python-prettytable": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "python-argparse": {
+            "version": "1.1*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/keystone.json b/conf/pkgs/keystone.json
index 48b49869..237d871c 100644
--- a/conf/pkgs/keystone.json
+++ b/conf/pkgs/keystone.json
@@ -152,5 +152,88 @@
             "version": "2.1*",
             "removable": false
         }
+    },
+    "fedora-16": {
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-lxml": {
+            # Trashes IPA client, which is probably bad
+            "version": "2.3*",
+            "removable": true
+        },
+        "python-paste-script": {
+            "version": "1.7*",
+            "removable": true
+        },
+        "python-prettytable": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "MySQL-python": {
+            "version": "1.2*",
+            "removable": true
+        },
+        "python-migrate": {
+            "version": "0.7*",
+            "removable": true
+        },
+        "python-paste-deploy": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-paste": {
+            "version": "1.7.5*",
+            "removable": true
+        },
+        "sqlite": {
+            "version": "3.7*",
+            # Trashes alot of the base os (so we don't allow it to be removed)
+            "removable": false
+        },
+        "python-sqlite2": {
+            # This might be way to old :(
+            "version": "2.3*",
+            "removable": true
+        },
+        "python-sqlalchemy": {
+            "version": "0.7*",
+            "removable": true
+        },
+        "python-webob": {
+            "version": "1.0*",
+            "removable": true
+        },
+        "python-argparse": {
+            "version": "1.1*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3.1*",
+            "removable": true
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "python-passlib": {
+            "version": "1.5*",
+            "removable": true
+        },
+        # Is this right??
+        # This is for libldap2
+        "openldap": {
+            # Trashes alot of the base os (so we don't allow it to be removed)
+            "removable": false,
+            "version": "2.4*"
+        },
+        # Is this right??
+        # This is for libsasl2
+        "cyrus-sasl-lib": {
+            # Trashes alot of the base os (so we don't allow it to be removed)
+            "version": "2.1*",
+            "removable": false
+        }
     }
 }
diff --git a/conf/pkgs/n-api.json b/conf/pkgs/n-api.json
index fc92fc0d..60365912 100644
--- a/conf/pkgs/n-api.json
+++ b/conf/pkgs/n-api.json
@@ -15,5 +15,11 @@
             "version": "1.4*",
             "removable": false
         }
+    },
+    "fedora-16": {
+        "python-dateutil": {
+            "version": "1.5*",
+            "removable": false
+        }
     }
 }
diff --git a/conf/pkgs/n-cpu.json b/conf/pkgs/n-cpu.json
index c83ad2ff..3acb72d5 100644
--- a/conf/pkgs/n-cpu.json
+++ b/conf/pkgs/n-cpu.json
@@ -73,5 +73,35 @@
             "version": "0.9.4*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "lvm2": {
+            "version": "2.02*",
+            "removable": true
+        },
+        "iscsi-initiator-utils": {
+            "version": "6.2*",
+            "removable": true
+        },
+        "qemu-system-x86": {
+            "version": "0.15*",
+            "removable": true
+        },
+        "qemu-img":  {
+            "version": "0.15*",
+            "removable": true
+        },
+        "libvirt-python": {
+            "version": "0.9.6*",
+            "removable": true
+        },
+        "libvirt-client": {
+            "version": "0.9.6*",
+            "removable": true
+        },
+        "libvirt": {
+            "version": "0.9.6*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/n-vnc.json b/conf/pkgs/n-vnc.json
index 6fd8e076..0f0f271f 100644
--- a/conf/pkgs/n-vnc.json
+++ b/conf/pkgs/n-vnc.json
@@ -18,5 +18,11 @@
         #     "version": "1:1.5*",
         #     "removable": true
         # }
+    },
+    "fedora-16": {
+        "numpy": {
+            "version": "1.6*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/n-vol.json b/conf/pkgs/n-vol.json
index 54126712..34c63243 100644
--- a/conf/pkgs/n-vol.json
+++ b/conf/pkgs/n-vol.json
@@ -33,5 +33,19 @@
             "version": "6.2*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "lvm2": {
+            "version": "2.02*",
+            "removable": true
+        },
+        "scsi-target-utils": {
+            "version": "1.0*",
+            "removable": true
+        },
+        "iscsi-initiator-utils": {
+            "version": "6.2*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/nova-client.json b/conf/pkgs/nova-client.json
index 9ebbbbcb..3d5e65d0 100644
--- a/conf/pkgs/nova-client.json
+++ b/conf/pkgs/nova-client.json
@@ -25,5 +25,15 @@
             "version": "0.5*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        "python-argparse": {
+            "version": "1.1*",
+            "removable": true
+        },
+        "python-prettytable": {
+            "version": "0.5*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/nova.json b/conf/pkgs/nova.json
index d19beacb..dfadbce4 100644
--- a/conf/pkgs/nova.json
+++ b/conf/pkgs/nova.json
@@ -274,5 +274,123 @@
             "version": "5.0*",
             "removable": true
         }
+    },
+    "fedora-16": {
+        # For dhcp_release
+        "dnsmasq": {
+            "version": "2.58*",
+            "removable": false
+        },
+        "kpartx": {
+            "version": "0.4*",
+            "removable": false
+        },
+        "parted": {
+            "version": "3.0*",
+            "removable": false
+        },
+        "iputils": {
+            "version": "20101006*",
+            "removable": false
+        },
+        "MySQL-python": {
+            "version": "1.2*",
+            "removable": true
+        },
+        # Needed for glance which is needed for nova --- this shouldn't be here
+        "pyxattr": {
+            "version": "0.5*",
+            "removable": true
+        },
+        # Needed for glance which is needed for nova --- this shouldn't be here
+        "python-lxml": {
+            "version": "2.3*",
+            "removable": true
+        },
+        "iptables": {
+            "version": "1.4*",
+            "removable": false
+        },
+        "ebtables": {
+            "version": "2.0*",
+            "removable": false
+        },
+        "sqlite": {
+            "version": "3.7*",
+            # Trashes alot of the base os (so we don't allow it to be removed)
+            "removable": false
+        },
+        # ???
+        # "vconfig": {
+        #     "version": "1.9*",
+        #     "removable": true
+        # },
+        # Used by ajaxterm
+        "socat": {
+            "version": "1.7*",
+            "removable": true
+        },
+        "python-paste": {
+            "version": "1.7.5*",
+            "removable": true
+        },
+        "python-gflags": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3.1*",
+            "removable": true
+        },
+        # This seems to kill RHN/yum if its removed ??
+        # TODO verify...libxml2-python dependencies do not include yum
+        "libxml2-python": {
+            "version": "2.7*",
+            "removable": false
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "python-netaddr": {
+            "version": "0.7*",
+            "removable": true
+        },
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-cheetah": {
+            "version": "2.4*",
+            "removable": true
+        },
+        "python-carrot": {
+            "version": "0.10*",
+            "removable": true
+        },
+        "python-suds": {
+            "version": "0.4*",
+            "removable": true
+        },
+        "python-lockfile": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-crypto": {
+            "version": "2.3*",
+            "removable": false
+        },
+        "python-boto": {
+            "version": "2.0*",
+            "removable": true
+        },
+        "python-kombu": {
+            "version": "1.1*",
+            "removable": true
+        },
+        "python-feedparser": {
+            "version": "5.0*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/quantum-client.json b/conf/pkgs/quantum-client.json
index 301f9078..553f7645 100644
--- a/conf/pkgs/quantum-client.json
+++ b/conf/pkgs/quantum-client.json
@@ -15,6 +15,11 @@
         "python-gflags": {
             "version": "1.4*",
             "removable": true
+    },
+    "fedora-16": {
+        "python-gflags": {
+            "version": "1.5*",
+            "removable": true
         }
     }
 }
diff --git a/conf/pkgs/quantum-openvswitch.json b/conf/pkgs/quantum-openvswitch.json
index efc91f29..648c25cc 100644
--- a/conf/pkgs/quantum-openvswitch.json
+++ b/conf/pkgs/quantum-openvswitch.json
@@ -26,4 +26,20 @@
     "rhel-6": {
         #TBD
     }
+    "fedora-16": {
+        # Not available yet
+#        "openvswitch": {
+#            "version": "1.4*",
+#            "removable": true
+#        },
+        # Seems needed for ovs_quantum_agent.py
+        "python-sqlalchemy": {
+            "version": "0.7*",
+            "removable": true
+        },
+        "MySQL-python": {
+            "version": "1.2*",
+            "removable": true
+        }
+    }
 }
diff --git a/conf/pkgs/quantum.json b/conf/pkgs/quantum.json
index 693b4167..21e3bdfa 100644
--- a/conf/pkgs/quantum.json
+++ b/conf/pkgs/quantum.json
@@ -36,5 +36,35 @@
     },
     "rhel-6": {
         #TBD
+    },
+    "fedoara-16": {
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3*",
+            "removable": true
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "python-lxml": {
+            "version": "2.3*",
+            "removable": true
+        },
+        "python-paste": {
+            "version": "1.7*",
+            "removable": true
+        },
+        "python-gflags": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-paste-deploy": {
+            "version": "1.5*",
+            "removable": true
+        }
     }
 }
diff --git a/conf/pkgs/rabbitmq.json b/conf/pkgs/rabbitmq.json
index 9ee57e7f..4fc3bbbe 100644
--- a/conf/pkgs/rabbitmq.json
+++ b/conf/pkgs/rabbitmq.json
@@ -27,5 +27,22 @@
                 }
             ]
         }
+    },
+    "fedora-16": {
+        "rabbitmq-server": {
+            "version": "2.6*",
+            "removable": true,
+            "pre-install": [
+                {
+                    # Qpidd runs on the same port
+                    "run_as_root": true,
+                    "cmd": [
+                        "service",
+                        "qpidd",
+                        "stop"
+                    ]
+                }
+            ]
+        }
     }
 }
diff --git a/conf/pkgs/swift.json b/conf/pkgs/swift.json
index 4f802363..c0ca4ea1 100644
--- a/conf/pkgs/swift.json
+++ b/conf/pkgs/swift.json
@@ -49,5 +49,44 @@
     },
     "rhel-6": {
         # TBD
+    },
+    "fedora-16": {
+        # installed for swift-keystone
+        "memcached": {
+            "version": "1.4*",
+            "removable": true
+        },
+        "python-configobj": {
+            "version": "4.7*",
+            "removable": true
+        },
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3*",
+            "removable": true
+        },
+        "python-netifaces": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "python-paste-deploy": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-webob": {
+            "version": "1.0*",
+            "removable": true
+        },
+        "pyxattr": {
+            "version": "0.5*",
+            "removable": true
+        },
+        "sqlite": {
+            "version": "3.7*",
+            "removable": true
+        }
     }
 }
diff --git a/devstack/components/db.py b/devstack/components/db.py
index 4951bdb0..f4637cbc 100644
--- a/devstack/components/db.py
+++ b/devstack/components/db.py
@@ -48,6 +48,12 @@ DB_ACTIONS = {
                 'status': ["service", 'mysqld', "status"],
                 'restart': ["service", 'mysqld', "restart"],
             },
+            settings.FEDORA16: {
+                'start': ["service", "mysqld", 'start'],
+                'stop': ["service", 'mysqld', "stop"],
+                'status': ["service", 'mysqld', "status"],
+                'restart': ["service", 'mysqld', "restart"],
+            },
         },
         #modification commands
         'set_pwd': ['mysql', '-u', '%USER%', '--password=%OLD_PASSWORD%', '-e', ("\"USE mysql; UPDATE user SET "
diff --git a/devstack/components/horizon.py b/devstack/components/horizon.py
index 0f7541e2..4bd01cbf 100644
--- a/devstack/components/horizon.py
+++ b/devstack/components/horizon.py
@@ -42,6 +42,7 @@ APACHE_CONF_TARGETS = {
     settings.UBUNTU11: '/etc/apache2/sites-enabled/000-default',
     #ensure runs after wsgi.conf
     settings.RHEL6: '/etc/httpd/conf.d/wsgi-horizon-000-default.conf',
+    settings.FEDORA16: '/etc/httpd/conf.d/wsgi-horizon-000-default.conf',
 }
 CONFIGS = [HORIZON_PY_CONF, HORIZON_APACHE_CONF]
 
diff --git a/devstack/pip.py b/devstack/pip.py
index b8d8848d..995e9f23 100644
--- a/devstack/pip.py
+++ b/devstack/pip.py
@@ -26,6 +26,7 @@ PIP_INSTALL_CMD_OPTS = ['-q']
 #the pip command is named different :-(
 PIP_CMD_NAMES = {
     settings.RHEL6: 'pip-python',
+    settings.FEDORA16: 'pip-python',
     settings.UBUNTU11: 'pip',
 }
 
diff --git a/devstack/progs/actions.py b/devstack/progs/actions.py
index a526e2d2..d9d30d23 100644
--- a/devstack/progs/actions.py
+++ b/devstack/progs/actions.py
@@ -40,6 +40,7 @@ LOG = logging.getLogger("devstack.progs.actions")
 _PKGR_MAP = {
     settings.UBUNTU11: apt.AptPackager,
     settings.RHEL6: yum.YumPackager,
+    settings.FEDORA16: yum.YumPackager,
 }
 
 # This is used to map an action to a useful string for
diff --git a/devstack/settings.py b/devstack/settings.py
index a4aa8dba..e3510b23 100644
--- a/devstack/settings.py
+++ b/devstack/settings.py
@@ -21,6 +21,7 @@ import re
 # ie in the pkg/pip listings so update there also!
 UBUNTU11 = "ubuntu-oneiric"
 RHEL6 = "rhel-6"
+FEDORA16 = "fedora-16"
 
 # What this program is called
 PROG_NICE_NAME = "DEVSTACKpy"
@@ -111,4 +112,5 @@ STACK_CONFIG_LOCATION = os.path.join(STACK_CONFIG_DIR, "stack.ini")
 KNOWN_DISTROS = {
     UBUNTU11: re.compile(r'Ubuntu(.*)oneiric', re.IGNORECASE),
     RHEL6: re.compile(r'redhat-6\.2', re.IGNORECASE),
+    FEDORA16: re.compile(r'fedora-16', re.IGNORECASE),
 }