diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py
--- a/contrib/gitian-build.py
+++ b/contrib/gitian-build.py
@@ -50,7 +50,8 @@
 def build():
     global args, workdir
 
-    os.makedirs('bitcoin-binaries/' + args.version, exist_ok=True)
+    base_output_dir = 'bitcoin-binaries/' + args.version
+    os.makedirs(base_output_dir + '/src', exist_ok=True)
     print('\nBuilding Dependencies\n')
     os.chdir('gitian-builder')
     os.makedirs('inputs', exist_ok=True)
@@ -64,8 +65,11 @@
                                '--url', 'bitcoin='+args.url, '../bitcoin-abc/contrib/gitian-descriptors/gitian-linux.yml'])
         subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version +
                                '-linux', '--destination', '../gitian.sigs/', '../bitcoin-abc/contrib/gitian-descriptors/gitian-linux.yml'])
+        os.makedirs('../' + base_output_dir + '/linux', exist_ok=True)
         subprocess.check_call(
-            'mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True)
+            'mv build/out/bitcoin-*.tar.gz ../' + base_output_dir + '/linux', shell=True)
+        subprocess.check_call(
+            'mv build/out/src/bitcoin-*.tar.gz ../' + base_output_dir + '/src', shell=True)
 
     if args.windows:
         print('\nCompiling ' + args.version + ' Windows')
@@ -73,10 +77,13 @@
                                '--url', 'bitcoin='+args.url, '../bitcoin-abc/contrib/gitian-descriptors/gitian-win.yml'])
         subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version +
                                '-win-unsigned', '--destination', '../gitian.sigs/', '../bitcoin-abc/contrib/gitian-descriptors/gitian-win.yml'])
+        os.makedirs('../' + base_output_dir + '/win', exist_ok=True)
         subprocess.check_call(
             'mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/', shell=True)
         subprocess.check_call(
-            'mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True)
+            'mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../' + base_output_dir + '/win', shell=True)
+        subprocess.check_call(
+            'mv build/out/src/bitcoin-*.tar.gz ../' + base_output_dir + '/src', shell=True)
 
     if args.macos:
         print('\nCompiling ' + args.version + ' MacOS')
@@ -84,10 +91,13 @@
                                '--url', 'bitcoin='+args.url, '../bitcoin-abc/contrib/gitian-descriptors/gitian-osx.yml'])
         subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version +
                                '-osx-unsigned', '--destination', '../gitian.sigs/', '../bitcoin-abc/contrib/gitian-descriptors/gitian-osx.yml'])
+        os.makedirs('../' + base_output_dir + '/osx', exist_ok=True)
         subprocess.check_call(
             'mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/', shell=True)
         subprocess.check_call(
-            'mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg build/out/src/bitcoin-*.tar.gz ../bitcoin-binaries/'+args.version, shell=True)
+            'mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../' + base_output_dir + '/osx', shell=True)
+        subprocess.check_call(
+            'mv build/out/src/bitcoin-*.tar.gz ../' + base_output_dir + '/src', shell=True)
 
     os.chdir(workdir)