gistfile1.diff

diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index b8d1d44..d9be1ff 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -54,6 +54,11 @@ module Exception2MessageMapper
 
   def E2MM.extend_object(cl)
     super
+    unless cl.respond_to? :bind
+      class << cl
+        extend Exception2MessageMapper
+      end
+    end
     cl.bind(self) unless cl < E2MM
   end
   
diff --git a/rakelib/builder.rb b/rakelib/builder.rb
index f04bdd2..b6313e8 100644
--- a/rakelib/builder.rb
+++ b/rakelib/builder.rb
@@ -26,7 +26,7 @@ ARCHS =
     $stderr.puts "getting archs from RC_ARCHS!"
     s.strip.split(/\s+/)
   else
-    do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') }
+    do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386}) { |x| x.split(',') }
   end
 LLVM_PATH = do_option('llvm_path', '/usr/local')
 FRAMEWORK_NAME = do_option('framework_name', 'MacRuby')