diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 3c67b50c..d7ecab59 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -66,12 +66,13 @@ def genkey(keystore, repo_keyalias, password, keydname):
                 '-storepass:file', config['keystorepassfile'],
                 '-keypass:file', config['keypassfile'],
                 '-dname', keydname])
+    # TODO keypass should be sent via stdin
     if p.returncode != 0:
         raise BuildException("Failed to generate key", p.stdout)
     # now show the lovely key that was just generated
     p = FDroidPopen(['keytool', '-list', '-v',
-                '-keystore', keystore, '-alias', repo_keyalias])
-    output = p.communicate(password)[0]
+                '-keystore', keystore, '-alias', repo_keyalias],
+                '-storepass:file', config['keystorepassfile'])
     logging.info(output.lstrip().strip() + '\n\n')
 
 
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 1c241501..5a75a85c 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -132,6 +132,7 @@ def main():
                 '-storepass:file', config['keystorepassfile'],
                 '-keypass:file', config['keypassfile'],
                 '-dname', config['keydname']])
+            # TODO keypass should be sent via stdin
             if p.returncode != 0:
                 raise BuildException("Failed to generate key")
 
@@ -141,6 +142,7 @@ def main():
             '-keypass:file', config['keypassfile'], '-sigalg',
             'MD5withRSA', '-digestalg', 'SHA1',
                 apkfile, keyalias])
+        # TODO keypass should be sent via stdin
         if p.returncode != 0:
             raise BuildException("Failed to sign application")
 
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 55d4b0e2..6e54bbc0 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -800,6 +800,7 @@ def make_index(apps, apks, repodir, archive, categories):
             '-keypass:file', config['keypassfile'],
             '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
             os.path.join(repodir, 'index.jar') , config['repo_keyalias']])
+        # TODO keypass should be sent via stdin
         if p.returncode != 0:
             logging.info("Failed to sign index")
             sys.exit(1)