diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index b088d526..60442554 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -31,11 +31,11 @@ from ConfigParser import ConfigParser
 from argparse import ArgumentParser
 import logging
 
-import common
-import net
-import metadata
-import scanner
-from common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
+from . import common
+from . import net
+from . import metadata
+from . import scanner
+from .common import FDroidException, BuildException, VCSException, FDroidPopen, SdkToolsPopen
 
 try:
     import paramiko
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index a285259d..8ca14edc 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -30,10 +30,10 @@ from distutils.version import LooseVersion
 import logging
 import copy
 
-import common
-import metadata
-from common import VCSException, FDroidException
-from metadata import MetaDataException
+from . import common
+from . import metadata
+from .common import VCSException, FDroidException
+from .metadata import MetaDataException
 
 
 # Check for a new version by looking at a document retrieved via HTTP.
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 623d1ab2..32774180 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -40,7 +40,7 @@ from queue import Queue
 from zipfile import ZipFile
 
 import fdroidserver.metadata
-from fdroidserver.asynchronousfilereader import AsynchronousFileReader
+from .asynchronousfilereader import AsynchronousFileReader
 
 
 XMLElementTree.register_namespace('android', 'http://schemas.android.com/apk/res/android')
diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index f27b9651..41b5a43f 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -22,8 +22,8 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import FDroidPopen
+from . import common
+from .common import FDroidPopen
 
 config = None
 options = None
diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 5cead3f2..a81bd55e 100644
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -24,8 +24,9 @@ import urllib
 from argparse import ArgumentParser
 from ConfigParser import ConfigParser
 import logging
-import common
-import metadata
+
+from . import common
+from . import metadata
 
 
 # Get the repo type and address from the given web page. The page is scanned
diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 4bed02c1..590307d9 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -27,7 +27,7 @@ import sys
 from argparse import ArgumentParser
 import logging
 
-import common
+from . import common
 
 config = {}
 options = None
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 69215301..350003ac 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -23,8 +23,8 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import SdkToolsPopen, FDroidException
+from . import common
+from .common import SdkToolsPopen, FDroidException
 
 options = None
 config = None
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 1bcb09ff..e2e88941 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -21,9 +21,9 @@ import re
 import sys
 from sets import Set
 
-import common
-import metadata
-import rewritemeta
+from . import common
+from . import metadata
+from . import rewritemeta
 
 config = None
 options = None
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index c3438234..7dda4e8b 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -25,9 +25,9 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-import metadata
-from common import FDroidPopen, SdkToolsPopen, BuildException
+from . import common
+from . import metadata
+from .common import FDroidPopen, SdkToolsPopen, BuildException
 
 config = None
 options = None
diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 16f187f2..e04b5623 100644
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
-from fdroidserver import common
-from fdroidserver import metadata
+from . import common
+from . import metadata
 
 
 def main():
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index dc2cca6a..971ab18c 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -22,8 +22,8 @@ import os
 import logging
 import io
 
-from fdroidserver import common
-from fdroidserver import metadata
+from . import common
+from . import metadata
 
 config = None
 options = None
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 76eb73ea..d8f568c4 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -22,9 +22,9 @@ import traceback
 from argparse import ArgumentParser
 import logging
 
-import common
-import metadata
-from common import BuildException, VCSException
+from . import common
+from . import metadata
+from .common import BuildException, VCSException
 
 config = None
 options = None
diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index dfa3a1a6..ed39f0a7 100644
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -25,7 +25,8 @@ import pwd
 import subprocess
 from argparse import ArgumentParser
 import logging
-import common
+
+from . import common
 
 config = None
 options = None
diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 7ae9fb7b..c550b995 100644
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -21,8 +21,8 @@ import os
 from argparse import ArgumentParser
 import logging
 
-import common
-from common import FDroidPopen
+from . import common
+from .common import FDroidPopen
 
 config = None
 options = None
diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index 351390fb..cd1e7a67 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -27,11 +27,12 @@ from argparse import ArgumentParser
 import paramiko
 import socket
 import logging
-import common
-import metadata
 import subprocess
 from collections import Counter
 
+from . import common
+from . import metadata
+
 
 def carbon_send(key, value):
     s = socket.socket()
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index b171d423..a67477e9 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -40,10 +40,10 @@ from binascii import hexlify, unhexlify
 from PIL import Image
 import logging
 
-import common
-import metadata
-from common import FDroidPopen, SdkToolsPopen
-from metadata import MetaDataException
+from . import common
+from . import metadata
+from .common import FDroidPopen, SdkToolsPopen
+from .metadata import MetaDataException
 
 screen_densities = ['640', '480', '320', '240', '160', '120']
 
diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 6ffff876..82a690c4 100644
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -22,9 +22,9 @@ import glob
 from argparse import ArgumentParser
 import logging
 
-import common
-import net
-from common import FDroidException
+from . import common
+from . import net
+from .common import FDroidException
 
 options = None
 config = None