diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 3b1d99aa..2e0d258d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -700,7 +700,10 @@ class vcs_gitsvn(vcs):
 
     def gettags(self):
         self.checkrepo()
-        return os.listdir(os.path.join(self.local, '.git/svn/refs/remotes/tags'))
+        for treeish in ['origin/', '']:
+            d = os.path.join(self.local, '.git', 'svn', 'refs', 'remotes', treeish, 'tags')
+            if os.path.isdir(d):
+                return os.listdir(d)
 
     def getref(self):
         self.checkrepo()