diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 109425cc..c60069d5 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -618,7 +618,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
         bindir = os.path.join(root_dir, 'bin')
 
-    if p.returncode != 0:
+    if p is not None and p.returncode != 0:
         raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
     print "Successfully built version " + thisbuild['version'] + ' of ' + app['id']
 
@@ -655,6 +655,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk,
             re.S|re.M).group(1)
         src = os.path.join(bindir, src)
+    elif thisbuild['type'] == 'raw':
+        src = os.path.join(root_dir, thisbuild['output'])
+        src = os.path.normpath(src)
 
     # Make sure it's not debuggable...
     if common.isApkDebuggable(src, config):
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index c31a451a..4f1a60b0 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -470,6 +470,8 @@ def parse_metadata(metafile):
         for t in ['maven', 'gradle', 'kivy']:
             if build.get(t, 'no') != 'no':
                 return t
+        if 'output' in build:
+            return 'raw'
         return 'ant'
 
     thisinfo = {}
@@ -698,7 +700,7 @@ def write_metadata(dest, app):
         # This defines the preferred order for the build items - as in the
         # manual, they're roughly in order of application.
         keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
-                    'gradle', 'maven', 'oldsdkloc', 'target',
+                    'gradle', 'maven', 'output', 'oldsdkloc', 'target',
                     'update', 'encoding', 'forceversion', 'forcevercode', 'rm',
                     'fixtrans', 'fixapos', 'extlibs', 'srclibs', 'patch',
                     'prebuild', 'scanignore', 'scandelete', 'build', 'buildjni',