diff --git a/setup.py b/setup.py
index 4d5a104..5973c0f 100644
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,7 @@ setup(
         'cherrypy',
         'bottle',
         'clize',
+        'lockfile',
     ],
     include_package_data=True,
     dependency_links=[
diff --git a/zerobin/paste.py b/zerobin/paste.py
index 2690b61..e5ecad7 100644
--- a/zerobin/paste.py
+++ b/zerobin/paste.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals, absolute_import
 import os
 import hashlib
 import base64
+import lockfile
 
 from datetime import datetime, timedelta
 
@@ -124,18 +125,9 @@ class Paste(object):
         """
         path = settings.PASTE_FILES_ROOT
         counter_file = os.path.join(path, 'counter')
-        lock_file = os.path.join(path, 'counter.lock')
-
-        # TODO : change lock implementation to use the lockfile lib
-        # https://pypi.python.org/pypi/lockfile
-        # The current lock implementation sucks. It skips some increment, and
-        # still allows race conditions.
-        if not os.path.isfile(lock_file):
-            try:
-                # Aquire lock file
-                with open(lock_file, "w") as flock:
-                    flock.write('lock')
+        lock = lockfile.LockFile(counter_file)
 
+        with lock:
                 # Read the value from the counter
                 try:
                     with open(counter_file, "r") as fcounter:
@@ -147,9 +139,6 @@ class Paste(object):
                 with open(counter_file, "w") as fcounter:
                     fcounter.write(str(counter_value))
 
-            finally:
-                # remove lock file
-                os.remove(lock_file)
 
     def save(self):
         """