diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff
index d8ca12d3e6..e03ccc5ed8 100755
--- a/scripts/buildhistory-diff
+++ b/scripts/buildhistory-diff
@@ -45,6 +45,11 @@ def main():
         sys.stderr.write("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script\n")
         sys.exit(1)
 
+    if not os.path.exists(options.buildhistory_dir):
+        if options.buildhistory_dir == 'buildhistory/':
+            cwd = os.getcwd()
+            if os.path.basename(cwd) == 'buildhistory':
+                options.buildhistory_dir = cwd
     if not os.path.exists(options.buildhistory_dir):
         sys.stderr.write('Buildhistory directory "%s" does not exist\n\n' % options.buildhistory_dir)
         parser.print_help()