diff --git a/bots.rb b/bots.rb
index 5f0ccc6..98ff53c 100644
--- a/bots.rb
+++ b/bots.rb
@@ -35,6 +35,8 @@ class BoodooBot
     @access_token =       SETTINGS['ACCESS_TOKEN']
     @access_token_secret =SETTINGS['ACCESS_TOKEN_SECRET']
     @tweet_interval =     SETTINGS['TWEET_INTERVAL']
+    @tweet_on_hour =      SETTINGS['TWEET_ON_HOUR']
+
     @update_follows_interval = SETTINGS['UPDATE_FOLLOWS_INTERVAL']
     @refresh_model_interval = SETTINGS['REFRESH_MODEL_INTERVAL']
 
@@ -94,7 +96,14 @@ class BoodooBot
 
     scheduler.interval @tweet_interval do
       if rand < @tweet_chance
-        tweet(model.make_statement)
+        if @tweet_on_hour
+          tweet(model.make_statement)
+        else
+          # schedule tweet to happen at a random minute this hour
+          in_this_many_min = rand(1..59).to_s + 'm'
+          scheduler.in.this_many_min do
+            tweet(model.make_statement)
+          end
       end
     end
 
diff --git a/defaults.env b/defaults.env
index 912d3be..f92dec1 100644
--- a/defaults.env
+++ b/defaults.env
@@ -5,6 +5,7 @@ CONSUMER_SECRET=
 ACCESS_TOKEN=
 ACCESS_TOKEN_SECRET=
 TWEET_INTERVAL=2h
+TWEET_ON_HOUR=false
 TWEET_CHANCE=0.8
 BLACKLIST=tinysubversions, dril
 BANNED_TERMS=voldemort, evgeny morozov, heroku