diff -up BitTorrent-5.3-GPL/auto-update/check_signature.py.sha BitTorrent-5.3-GPL/auto-update/check_signature.py
--- BitTorrent-5.3-GPL/auto-update/check_signature.py.sha	2009-02-04 22:42:11.000000000 +0000
+++ BitTorrent-5.3-GPL/auto-update/check_signature.py	2010-02-25 13:20:32.312420396 +0000
@@ -17,7 +17,7 @@ from common import sig_ext, pub_key_path
 
 import sys
 import pickle
-from sha import sha
+from BTL.hash import sha
 
 public_key_file = open(pub_key_path, 'rb')
 
diff -up BitTorrent-5.3-GPL/auto-update/sign_file.py.sha BitTorrent-5.3-GPL/auto-update/sign_file.py
--- BitTorrent-5.3-GPL/auto-update/sign_file.py.sha	2009-02-04 22:42:11.000000000 +0000
+++ BitTorrent-5.3-GPL/auto-update/sign_file.py	2010-02-25 13:20:32.312420396 +0000
@@ -18,7 +18,7 @@ from common import sig_ext, pri_key_path
 import sys
 import time 
 import pickle
-from sha import sha
+from BTL.hash import sha
 from Crypto.Util import randpool
 
 r = randpool.KeyboardRandomPool()
diff -up BitTorrent-5.3-GPL/BTL/crypto_message.py.sha BitTorrent-5.3-GPL/BTL/crypto_message.py
--- BitTorrent-5.3-GPL/BTL/crypto_message.py.sha	2009-02-04 22:43:05.000000000 +0000
+++ BitTorrent-5.3-GPL/BTL/crypto_message.py	2010-02-25 13:20:32.312420396 +0000
@@ -11,7 +11,10 @@
 # by Benjamin C. Wiley Sittler
 
 import Crypto.Cipher.AES as _AES
-import sha as _sha
+try:
+    import hashlib.sha1 as _sha
+except ImportError:
+    import sha as _sha
 import os as _os
 import hmac as _hmac
 import string as _string
diff -up BitTorrent-5.3-GPL/BTL/hash.py.sha BitTorrent-5.3-GPL/BTL/hash.py
--- BitTorrent-5.3-GPL/BTL/hash.py.sha	2009-02-04 22:43:05.000000000 +0000
+++ BitTorrent-5.3-GPL/BTL/hash.py	2010-02-25 13:20:32.313424359 +0000
@@ -11,15 +11,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# don't use the new fast hash functions if available
-# they are slow on linux and windows.
-# stupid.
-
-import sha as shalib
-sha = shalib.sha
-##try:
-##    import hashlib
-##    sha = hashlib.sha1
-##except ImportError:
-##    import sha as shalib
-##    sha = shalib.sha
+try:
+    import hashlib
+    sha = hashlib.sha1
+except ImportError:
+    import sha as shalib
+    sha = shalib.sha
diff -up BitTorrent-5.3-GPL/khashmir/khashmir.py.sha BitTorrent-5.3-GPL/khashmir/khashmir.py
--- BitTorrent-5.3-GPL/khashmir/khashmir.py.sha	2009-02-04 22:42:11.000000000 +0000
+++ BitTorrent-5.3-GPL/khashmir/khashmir.py	2010-02-25 13:20:32.313424359 +0000
@@ -16,7 +16,7 @@ from socket import gethostbyname
 
 from BTL.platform import bttime as time
 
-from sha import sha
+from BTL.hash import sha
 import re
 from BitTorrent.defaultargs import common_options, rare_options
 from BitTorrent.RawServer_twisted import RawServer
diff -up BitTorrent-5.3-GPL/khashmir/khash.py.sha BitTorrent-5.3-GPL/khashmir/khash.py
--- BitTorrent-5.3-GPL/khashmir/khash.py.sha	2009-02-04 22:42:11.000000000 +0000
+++ BitTorrent-5.3-GPL/khashmir/khash.py	2010-02-25 13:23:14.081477747 +0000
@@ -11,7 +11,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from sha import sha
+from BTL.hash import sha
 from random import randint
 
 #this is ugly, hopefully os.entropy will be in 2.4
diff -up BitTorrent-5.3-GPL/khashmir/utkhashmir.py.sha BitTorrent-5.3-GPL/khashmir/utkhashmir.py
--- BitTorrent-5.3-GPL/khashmir/utkhashmir.py.sha	2009-02-04 22:42:11.000000000 +0000
+++ BitTorrent-5.3-GPL/khashmir/utkhashmir.py	2010-02-25 13:20:32.314427945 +0000
@@ -16,7 +16,7 @@ from actions import *
 from khash import newID
 from krpc import KRPCProtocolError, KRPCFailSilently
 from BTL.cache import Cache
-from sha import sha
+from BTL.hash import sha
 from util import *
 from BTL.stackthreading import Thread
 from socket import gethostbyname