diff --git a/manifests/messaging.pp b/manifests/messaging.pp
index ae94ad5c..8f31d62e 100644
--- a/manifests/messaging.pp
+++ b/manifests/messaging.pp
@@ -38,6 +38,19 @@ class cloud::messaging(
   $cluster_node_type = 'disc'
 ){
 
+  # Packaging issue: https://bugzilla.redhat.com/show_bug.cgi?id=1033305
+  if $::osfamily == 'RedHat' {
+    file {'/usr/sbin/rabbitmq-plugins':
+      ensure => link,
+      target => '/usr/lib/rabbitmq/bin/rabbitmq-plugins'
+    }
+
+    file {'/usr/sbin/rabbitmq-env':
+      ensure => link,
+      target => '/usr/lib/rabbitmq/bin/rabbitmq-env'
+    }
+  }
+
   class { 'rabbitmq':
     delete_guest_user        => true,
     config_cluster           => true,
diff --git a/spec/classes/cloud_messaging_spec.rb b/spec/classes/cloud_messaging_spec.rb
index ea05c40a..44151b64 100644
--- a/spec/classes/cloud_messaging_spec.rb
+++ b/spec/classes/cloud_messaging_spec.rb
@@ -68,6 +68,17 @@ describe 'cloud::messaging' do
     end
 
     it_configures 'openstack messaging'
+
+    it 'should create rabbitmq binaries symbolic links' do
+      should contain_file('/usr/sbin/rabbitmq-plugins').with(
+        :ensure => 'link',
+        :target => '/usr/lib/rabbitmq/bin/rabbitmq-plugins'
+      )
+      should contain_file('/usr/sbin/rabbitmq-env').with(
+        :ensure => 'link',
+        :target => '/usr/lib/rabbitmq/bin/rabbitmq-env'
+      )
+    end
   end
 
 end