diff --git a/notification/lockfile.py b/notification/lockfile.py
index eb2de9f8..d1707030 100644
--- a/notification/lockfile.py
+++ b/notification/lockfile.py
@@ -53,7 +53,6 @@
 import sys
 import socket
 import os
-import thread
 import threading
 import time
 import errno
@@ -63,6 +62,10 @@
     threading.current_thread
 except AttributeError:
     threading.current_thread = threading.currentThread
+try:
+    # python 2.6 has threading.current_thread so we need to do this separately.
+    threading.Thread.get_name
+except AttributeError:
     threading.Thread.get_name = threading.Thread.getName
 
 __all__ = ['Error', 'LockError', 'LockTimeout', 'AlreadyLocked',