diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index 1181d921bb0d..3dd09fa89f7e 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2009/11/21 19:28:34 tron Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitT/bitt/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 PYDISTUTILSPKG=	yes
 
@@ -16,5 +16,24 @@ CONFLICTS+=	BitTornado-[0-9]*
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
+
+.if ${PYVERSSUFFIX} != "2.4"
+SUBST_CLASSES+=         sha
+SUBST_MESSAGE.sha=	Fixing references to deprecated sha module.
+SUBST_STAGE.sha=	pre-configure
+SUBST_FILES.sha=	BitTorrent/ConvertedMetainfo.py
+SUBST_FILES.sha+=	BitTorrent/NewVersion.py
+SUBST_FILES.sha+=	BitTorrent/PeerID.py
+SUBST_FILES.sha+=	BitTorrent/StorageWrapper.py
+SUBST_FILES.sha+=	BitTorrent/download.py
+SUBST_FILES.sha+=	BitTorrent/makemetafile.py
+SUBST_FILES.sha+=	BitTorrent/parsedir.py
+SUBST_FILES.sha+=	khashmir/khash.py
+SUBST_FILES.sha+=	khashmir/khashmir.py
+SUBST_FILES.sha+=	khashmir/utkhashmir.py
+SUBST_FILES.sha+=	torrentinfo-console.py
+SUBST_SED.sha=		-e "s/^from sha import .*/from hashlib import sha1 as sha/"
+.endif
+
 .include "../../devel/py-cursespanel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"