diff --git a/lib/logstash/inputs/amqp.rb b/lib/logstash/inputs/amqp.rb
index 3d298ac77..6d89d75a9 100644
--- a/lib/logstash/inputs/amqp.rb
+++ b/lib/logstash/inputs/amqp.rb
@@ -7,11 +7,12 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
 
   config_name "amqp"
 
-  config :host, :validate => :string
-  config :user, :validate => :string
-  config :pass, :validate => :string
-  config :exchange_type, :validate => :string
-  config :name, :validate => :string
+  config :host, :validate => :string, :required => true
+  config :port, :validate => :number
+  config :user, :validate => :string, :required => true
+  config :pass, :validate => :string, :required => true
+  config :exchange_type, :validate => :string, :required => true
+  config :name, :validate => :string, :required => true
   config :vhost, :validate => :string
   config :durable, :validate => :boolean
   config :debug, :validate => :boolean
diff --git a/lib/logstash/inputs/base.rb b/lib/logstash/inputs/base.rb
index 7800a36cd..6d04db280 100644
--- a/lib/logstash/inputs/base.rb
+++ b/lib/logstash/inputs/base.rb
@@ -8,7 +8,7 @@ class LogStash::Inputs::Base
   attr_accessor :logger
 
   config_name "input"
-  config :type, :validate => :string
+  config :type, :validate => :string, :required => true
 
   config :tags, :validate => (lambda do |value|
     re = /^[A-Za-z0-9_]+$/
diff --git a/lib/logstash/inputs/beanstalk.rb b/lib/logstash/inputs/beanstalk.rb
index aa98bf0d4..80f5ba1d0 100644
--- a/lib/logstash/inputs/beanstalk.rb
+++ b/lib/logstash/inputs/beanstalk.rb
@@ -5,7 +5,7 @@ require "logstash/namespace"
 class LogStash::Inputs::Beanstalk < LogStash::Inputs::Base
 
   config_name "beanstalk"
-  config :tube # TODO(sissel): needs validation?
+  config :tube, :validate => :string, :required => true
 
   public
   def initialize(params)
diff --git a/lib/logstash/inputs/file.rb b/lib/logstash/inputs/file.rb
index 259e0b9e7..88afebee0 100644
--- a/lib/logstash/inputs/file.rb
+++ b/lib/logstash/inputs/file.rb
@@ -10,7 +10,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   @@filemanager_lock = Mutex.new
 
   config_name "file"
-  config :path # no validation on path, it can be anything.
+  config :path, :required => true
 
   public
   def register
diff --git a/lib/logstash/inputs/twitter.rb b/lib/logstash/inputs/twitter.rb
index 3eab4e9e0..749817e0f 100644
--- a/lib/logstash/inputs/twitter.rb
+++ b/lib/logstash/inputs/twitter.rb
@@ -7,7 +7,7 @@ require "logstash/namespace"
 class LogStash::Inputs::Twitter < LogStash::Inputs::Base
 
   config_name "twitter"
-  config :query # TODO(sissel): Validation?
+  config :query, :validate => :string, :required => true
 
   public
   def register