diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index f1c150989..0e48f2fa5 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -102,24 +102,45 @@ def get_application_version():
         return APPLICATION_VERSION
     if u'--dev-version' in sys.argv or u'-d' in sys.argv:
         # If we're running the dev version, let's use bzr to get the version.
-        bzr = Popen((u'bzr', u'tags', u'--sort', u'time'), stdout=PIPE)
-        output, error = bzr.communicate()
-        code = bzr.wait()
-        if code != 0:
-            raise Exception(u'Error running bzr tags')
-        lines = output.splitlines()
-        if not lines:
-            tag = u'0.0.0'
-            revision = u'0'
-        else:
-            tag, revision = lines[-1].split()
-        bzr = Popen((u'bzr', u'log', u'--line', u'-r', u'-1'), stdout=PIPE)
-        output, error = bzr.communicate()
-        code = bzr.wait()
-        if code != 0:
-            raise Exception(u'Error running bzr log')
-        latest = output.split(u':')[0]
-        full_version = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
+        try:
+            # If bzrlib is available, use it.
+            from bzrlib.branch import Branch
+            b = Branch.open_containing('.')[0]
+            b.lock_read()
+            try:
+                # Get the branch's latest revision number.
+                revno = b.revno()
+                # Convert said revision number into a bzr revision id.
+                revision_id = b.dotted_revno_to_revision_id((revno,))
+                # Get a dict of tags, with the revision id as the key.
+                tags = b.tags.get_reverse_tag_dict()
+                # Check if the latest
+                if revision_id in tags:
+                    full_version = u'%s' % tags[revision_id][0]
+                else:
+                    full_version = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno)
+            finally:
+                b.unlock()
+        except:
+            # Otherwise run the command line bzr client.
+            bzr = Popen((u'bzr', u'tags', u'--sort', u'time'), stdout=PIPE)
+            output, error = bzr.communicate()
+            code = bzr.wait()
+            if code != 0:
+                raise Exception(u'Error running bzr tags')
+            lines = output.splitlines()
+            if not lines:
+                tag = u'0.0.0'
+                revision = u'0'
+            else:
+                tag, revision = lines[-1].split()
+            bzr = Popen((u'bzr', u'log', u'--line', u'-r', u'-1'), stdout=PIPE)
+            output, error = bzr.communicate()
+            code = bzr.wait()
+            if code != 0:
+                raise Exception(u'Error running bzr log')
+            latest = output.split(u':')[0]
+            full_version = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
     else:
         # We're not running the development version, let's use the file.
         filepath = AppLocation.get_directory(AppLocation.VersionDir)
@@ -385,7 +406,7 @@ def get_natural_key(string):
     key = [int(part) if part.isdigit() else get_locale_key(part) for part in key]
     # Python 3 does not support comparision of different types anymore. So make sure, that we do not compare str and int.
     #if string[0].isdigit():
-    #    return [''] + key
+    #    return [''] + key 
     return key