diff --git a/files/apts/general b/files/apts/general
index 90529e55c7..4cd930384a 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -23,3 +23,4 @@ python-dev
 python2.7
 bc
 libyaml-dev
+libffi-dev
diff --git a/files/apts/glance b/files/apts/glance
index b5d8c77094..15e09aad4d 100644
--- a/files/apts/glance
+++ b/files/apts/glance
@@ -1,4 +1,3 @@
-libffi-dev
 libmysqlclient-dev  # testonly
 libpq-dev           # testonly
 libssl-dev          # testonly
diff --git a/files/apts/swift b/files/apts/swift
index 080ecdb255..fd51699238 100644
--- a/files/apts/swift
+++ b/files/apts/swift
@@ -1,5 +1,4 @@
 curl
-libffi-dev
 memcached
 python-configobj
 python-coverage
diff --git a/files/rpms/general b/files/rpms/general
index a0074dd690..74997a832c 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -7,6 +7,7 @@ git-core
 openssh-server
 openssl
 openssl-devel # to rebuild pyOpenSSL if needed
+libffi-devel
 libxml2-devel
 libxslt-devel
 psmisc
diff --git a/files/rpms/glance b/files/rpms/glance
index fc07fa787b..5a7f073f35 100644
--- a/files/rpms/glance
+++ b/files/rpms/glance
@@ -1,4 +1,3 @@
-libffi-devel
 libxml2-devel       # testonly
 libxslt-devel       # testonly
 mysql-devel         # testonly
diff --git a/files/rpms/swift b/files/rpms/swift
index 938d2c8fe6..9ec4aab8ce 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -1,5 +1,4 @@
 curl
-libffi-devel
 memcached
 python-configobj
 python-coverage