diff --git a/Formula/python.rb b/Formula/python.rb
index 278596aa6da..da058197516 100644
--- a/Formula/python.rb
+++ b/Formula/python.rb
@@ -1,12 +1,19 @@
 require 'brewkit'
 
 class Python <Formula
-  @url='http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2'
-  @homepage='http://www.python.org/'
-  @md5='245db9f1e0f09ab7e0faaa0cf7301011'
+  url 'http://python.org/ftp/python/2.6.3/Python-2.6.3.tar.bz2'
+  homepage 'http://www.python.org/'
+  md5 '8755fc03075b1701ca3f13932e6ade9f'
 
   # You can build Python without readline, but you really don't want to.
   depends_on 'readline' => :recommended
+  
+  def options
+    [
+      ["--framework", "Do a 'Framework' build instead of a UNIX-style build."],
+      ["--intel", "Build for both 32 & 64 bit Intel."]
+    ]
+  end
 
   def skip_clean? path
     path == bin+'python' or path == bin+'python2.6' or # if you strip these, it can't load modules
@@ -14,7 +21,19 @@ class Python <Formula
   end
 
   def install
-    system "./configure --prefix='#{prefix}' --with-framework-name=/Developer/SDKs/MacOSX#{MACOS_VERSION}.sdk"
+    args = ["--prefix=#{prefix}"]
+
+    if ARGV.include? '--framework'
+      args << "--with-framework-name=/Developer/SDKs/MacOSX#{MACOS_VERSION}.sdk"
+    end
+    
+    if ARGV.include? '--intel'
+      args << "--with-universal-archs=intel"
+    end
+    
+    system "./configure", *args
+    
+    
     system "make"
     system "make install"