diff --git a/README.md b/README.md
index 13630251..89d98d44 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Red
 	- HHVM
 - **Message Queueing Systems:**
 	- Beanstalkd (+ Beanstalkd Console)
+	- RabbitMQ (+ RabbitMQ Console)
 - **Tools:**
 	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
 	- phpMyAdmin
@@ -249,7 +250,7 @@ docker-compose up -d  nginx mysql
 
 You can select your own combination of Containers form the list below:
 
-`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `phpmyadmin`.
+`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `workspace`, `phpmyadmin`.
 
 
 **Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
diff --git a/docker-compose.yml b/docker-compose.yml
index 571fdb1c..7864d6a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -186,6 +186,21 @@ services:
         links:
             - php-fpm
 
+### RabbitMQ Container ####################################
+
+    rabbitmq:
+        build: ./rabbitmq
+        ports:
+            - "5672:5672"
+            - "15671:15671"
+            - "8080:15672"
+        privileged: true
+        environment:
+            RABBITMQ_DEFAULT_USER: guest
+            RABBITMQ_DEFAULT_PASS: guest
+        links:
+            - php-fpm
+
 ### Beanstalkd Console Container ############################
 
     beanstalkd-console:
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
new file mode 100644
index 00000000..1bdd485c
--- /dev/null
+++ b/rabbitmq/Dockerfile
@@ -0,0 +1,12 @@
+#
+# RabbitMQ Dockerfile
+#
+# https://github.com/dockerfile/rabbitmq
+#
+
+# Pull base image.
+FROM rabbitmq
+
+RUN rabbitmq-plugins enable --offline rabbitmq_management
+
+EXPOSE 15671 15672
\ No newline at end of file