diff --git a/lib/logstash/inputs/amqp.rb b/lib/logstash/inputs/amqp.rb
index 37a8f4179..8b4d049cd 100644
--- a/lib/logstash/inputs/amqp.rb
+++ b/lib/logstash/inputs/amqp.rb
@@ -28,6 +28,9 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
 
   # The name of the exchange
   config :name, :validate => :string, :required => true
+
+  # The name of the queue. If not set, defaults to the same name as the exchange.
+  config :queue_name, :validate => :string
   
   # The routing key to bind to
   config :key, :validate => :string
@@ -79,6 +82,10 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
       @amqpurl += "#{@user}:xxxxxx@"
     end
     @amqpurl += "#{@host}:#{@port}#{@vhost}/#{@name}"
+
+    if @queue_name.nil?
+      @queue_name = @name
+    end
   end # def register
 
   def run(queue)
@@ -88,7 +95,7 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
       return if terminating?
       @bunny.start
 
-      @queue = @bunny.queue(@name, :durable => @durable)
+      @queue = @bunny.queue(@queue_name, :durable => @durable)
       exchange = @bunny.exchange(@name, :type => @exchange_type.to_sym, :durable => @durable)
       @queue.bind(exchange, :key => @key)