diff --git a/defaults/main.yml b/defaults/main.yml
index e78e8a0..6b4695b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -41,7 +41,7 @@ barbican_system_user_home: "/var/lib/{{ barbican_system_user_name }}"
 barbican_etc_directory: /etc/barbican
 barbican_vassals_directory: "{{ barbican_etc_directory }}/vassals"
 
-#Aodh services info
+#Barbican services info
 barbican_api_program_name: barbican-api
 barbican_keystone_listener_program_name: barbican-keystone-listener
 barbican_worker_program_name: barbican-worker
diff --git a/vars/debian.yml b/vars/debian.yml
index 402b28f..9d9ad72 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -36,4 +36,8 @@ barbican_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
+barbican_oslomsg_amqp1_distro_packages:
+  - libsasl2-modules
+  - sasl2-bin
+
 barbican_uwsgi_bin: '/usr/bin'
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 606f610..1ae0dee 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -13,5 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-barbican_package_list: "{{ barbican_distro_packages + barbican_service_distro_packages }}"
+barbican_package_list: |-
+  {% set packages = (barbican_distro_packages + barbican_service_distro_packages) %}
+  {% if barbican_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(barbican_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 _barbican_bin: "/usr/bin"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index d6840b0..18d7851 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -36,4 +36,9 @@ barbican_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
+barbican_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl-lib
+  - cyrus-sasl-plain
+  - cyrus-sasl-md5
+
 barbican_uwsgi_bin: '/usr/sbin'
diff --git a/vars/source_install.yml b/vars/source_install.yml
index a50bc0a..4170650 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-barbican_package_list: "{{ barbican_distro_packages + barbican_devel_distro_packages }}"
+barbican_package_list: |-
+  {% set packages = (barbican_distro_packages + barbican_devel_distro_packages) %}
+  {% if barbican_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(barbican_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 _barbican_bin: "/openstack/venvs/barbican-{{ barbican_venv_tag }}/bin"
 barbican_uwsgi_bin: "{{ _barbican_bin }}"
diff --git a/vars/suse.yml b/vars/suse.yml
index 0546eaf..d4b448d 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -35,4 +35,9 @@ barbican_service_distro_packages:
   - uwsgi
   - uwsgi-python
 
+barbican_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl
+  - cyrus-sasl-plain
+  - cyrus-sasl-digestmd5
+
 barbican_uwsgi_bin: '/usr/sbin'