diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 1f49b449..969b18f8 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -286,6 +286,8 @@ def main():
                       help="Only process apps with auto-updates")
     parser.add_option("--commit", action="store_true", default=False,
                       help="Commit changes")
+    parser.add_option("--subdir-changes", action="store_true", default=False,
+                      help="Look for changes in app subdirectories")
     parser.add_option("--gplay", action="store_true", default=False,
                       help="Only print differences with the Play Store")
     (options, args) = parser.parse_args()
@@ -324,7 +326,7 @@ def main():
 
         if options.autoonly and app['Auto Update Mode'] == 'None':
             print "Nothing to do for %s..." % app['id']
-            return
+            continue
 
         print "Processing " + app['id'] + '...'
 
@@ -353,6 +355,8 @@ def main():
             version = None
             vercode = 'Invalid update check method'
 
+        if options.subdir-changes:
+
         updating = False
         if not version:
             print "..." + vercode