diff --git a/bin/couchview b/bin/couchview
index 65fc00e..b9079ef 100755
--- a/bin/couchview
+++ b/bin/couchview
@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-require File.dirname(__FILE__) + "/../lib/couchrest"
+%w(generate push).each do |file|
+  require File.dirname(__FILE__) + "/../lib/couchrest/commands/#{file}"
+end
 
 # Set defaults
 options = {