diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 575c6620..ebc31bcc 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -336,6 +336,8 @@ Github - @code{https://github.com/USER/PROJECT}
 @item
 Google Code - @code{http://code.google.com/p/PROJECT/}
 (supports git, svn and hg repos)
+@item
+Bitbucket - @code{https://bitbucket.org/USER/PROJECT/}
 @end enumerate
 
 Depending on the project type, more or less information may be gathered. For
diff --git a/import.py b/import.py
index 77c43db3..33a704c5 100755
--- a/import.py
+++ b/import.py
@@ -67,10 +67,17 @@ def main():
         repo = 'https://git.gitorious.org/' + url[22:] + '.git'
         repotype = 'git'
         sourcecode = url
+    elif url.startswith('https://bitbucket.org/'):
+        if url.endswith('/'):
+            url = url[:-1]
+        projecttype = 'bitbucket'
+        sourcecode = url + '/src'
+        issuetracker = url + '/issues'
+        repotype = 'hg'
+        repo = url
     elif url.startswith('http://code.google.com/p/'):
         if not url.endswith('/'):
-            print "Expected format for googlecode url is http://code.google.com/p/PROJECT/"
-            sys.exit(1)
+            url += '/';
         projecttype = 'googlecode'
         sourcecode = url + 'source/checkout'
         issuetracker = url + 'issues/list'