diff --git a/INSTALL.w64 b/INSTALL.w64
index 720b36d9..934e888a 100644
--- a/INSTALL.w64
+++ b/INSTALL.w64
@@ -25,6 +25,6 @@ comment out OSSLSIGN line in Makefile
 
 copy the installed Qt tree from windows host to ./qt/
 
-Edit the Qt path in xca-x.y.z/misc/build-w64.sh
-Now call xca-x.y.z/misc/build-w64.sh
-and wait until xca_setup.exe is built.
+Edit the Qt path in xca-x.y.z/release/build-w64.sh
+Now call xca-x.y.z/release/build-w64.sh
+and wait until xca-portable-x.y.z is built.
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 5d999f1b..20df4f36 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -53,7 +53,7 @@ html_theme_options = {
     'logo': 'bigcert.png',
     'logo_name': 'true',
     'fixed_sidebar': 'pinned',
-    'page_width': '1200px',
+    'page_width': '1150px',
 }
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/misc/delspace.sh b/misc/delspace.sh
deleted file mode 100755
index 0cf496dc..00000000
--- a/misc/delspace.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in $@; do
-  cp "$i" /tmp/x
-  cat /tmp/x |sed 's/[ \t]*$//' |sed 's/ *\t/\t/' > "$i"
-done
-
diff --git a/misc/release.txt b/misc/release.txt
deleted file mode 100644
index 27ca6536..00000000
--- a/misc/release.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Release schedule cheat sheet
-
-- Test, test, test
-- Test again
-- Check
-   - ign_openssl_error()
-   - for TRACE
-
-- update translation and xca.pro (qmake-qt4 -o makefile && make)
-- update changelog.txt doc/xca.sgml and README.md
-- ./git.release VERSION
-- Create xca.dmg
-- Create and sign MSI Installer
-- git push git.hohnstaedt.de
-- update xca.hohnstaedt.de:
-  scp changelog git.hohnstaedt.de:/var/cache/git/projects/changelog.txt
-
-# https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow
-
-# xcrun altool --notarize-app --primary-bundle-id "de.hohnstaedt.xca.dmg" --username "christian@hohnstaedt.de" --password "@keychain:AC_PASSWORD" --asc-provider HWR8GSJ73M --file "$DMG"
-
-# xcrun stapler staple "$DMG"
diff --git a/misc/binary-hashes.json b/release/binary-hashes.json
similarity index 100%
rename from misc/binary-hashes.json
rename to release/binary-hashes.json
diff --git a/misc/build-mac.sh b/release/build-mac.sh
similarity index 97%
rename from misc/build-mac.sh
rename to release/build-mac.sh
index 15ee210f..405c2da1 100755
--- a/misc/build-mac.sh
+++ b/release/build-mac.sh
@@ -56,5 +56,3 @@ cd "$XCA_BUILD"
 $XCA_DIR/configure --with-macos-version=10.13 --with-openssl="$INSTALL_DIR"
 make -j5
 cp *.dmg ..
-
-DMG=xca-2.3.0.139-Yosemite.dmg
diff --git a/misc/build-w64.sh b/release/build-w64.sh
similarity index 100%
rename from misc/build-w64.sh
rename to release/build-w64.sh
diff --git a/misc/gen-binary-hash b/release/gen-binary-hash
similarity index 62%
rename from misc/gen-binary-hash
rename to release/gen-binary-hash
index cc4f0ff5..884e597d 100755
--- a/misc/gen-binary-hash
+++ b/release/gen-binary-hash
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 set -ex
+hashes="$(dirname $0)/binary-hashes.json"
 
 export dir="$1"
 (
@@ -14,6 +15,6 @@ export dir="$1"
 	  "last":""
 	}
 	EOF
-) < misc/binary-hashes.json > misc/binary-hashes.json.tmp &&
+) < "$hashes" > "$hashes".tmp &&
 
-mv misc/binary-hashes.json.tmp misc/binary-hashes.json
+mv "$hashes".tmp "$hashes"
diff --git a/git.publish b/release/git.publish
similarity index 68%
rename from git.publish
rename to release/git.publish
index 17eafce6..710a4c99 100755
--- a/git.publish
+++ b/release/git.publish
@@ -10,16 +10,16 @@ export TVERSION
 
 releasedir="$HOME/xca-$TVERSION"
 
-./misc/gen-binary-hash "$releasedir"
+./release/gen-binary-hash "$releasedir"
 git commit -a -m "Release XCA $TVERSION done"
 
-./github.release.py "$TVERSION" "${releasedir}/"*xca*"$TVERSION"*
+./release/github.release.py "$TVERSION" "${releasedir}/"*xca*"$TVERSION"*
 
 cat << EOF
 
 After verifying the commits, tags and github release,
 finally do:
   git push origin --tags master
-  scp ${releasedir}/doc/* hohnstaedt.de:xca-doc/
+  scp -r ${releasedir}/doc/html hohnstaedt.de:xca-doc/
   Un-draft the release on github
 EOF
diff --git a/git.release b/release/git.release
similarity index 96%
rename from git.release
rename to release/git.release
index 889cb705..7e6802e5 100755
--- a/git.release
+++ b/release/git.release
@@ -69,7 +69,8 @@ cp xca-$TVERSION.tar.gz "$releasedir"
 )
 (
   cd ..
-  "./xca-$TVERSION/misc/build-w64.sh"
+  rm -rf xca_build
+  "./xca-$TVERSION/release/build-w64.sh"
   cp "xca-portable-${TVERSION}.zip" msi-installer-dir-${TVERSION}.zip "$releasedir"
 )
 
diff --git a/misc/git.release.something b/release/git.release.something
similarity index 100%
rename from misc/git.release.something
rename to release/git.release.something
diff --git a/github.release.py b/release/github.release.py
similarity index 95%
rename from github.release.py
rename to release/github.release.py
index 37af778a..48cb52a8 100755
--- a/github.release.py
+++ b/release/github.release.py
@@ -24,7 +24,7 @@ data = {
   "prerelease": True
 }
 
-passwd = input("Github Password for " + user + ": ")
+passwd = input("Github token for " + user + ": ")
 r = []
 
 response = requests.post(url, json=data, auth=(user, passwd))
diff --git a/release/release.txt b/release/release.txt
new file mode 100644
index 00000000..89e8af82
--- /dev/null
+++ b/release/release.txt
@@ -0,0 +1,33 @@
+Release schedule cheat sheet
+
+- Test, test, test
+- Test again
+- Check
+   - ign_openssl_error()
+   - for TRACE
+
+- update translation and xca.pro (qmake-qt4 -o makefile && make)
+- update changelog.txt doc/xca.sgml and README.md
+- ./git.release VERSION
+- Create xca.dmg
+- Create and sign MSI Installer
+- git push git.hohnstaedt.de
+- update xca.hohnstaedt.de:
+  scp changelog git.hohnstaedt.de:/var/cache/git/projects/changelog.txt
+
+https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow
+
+DMG=xca-2.4.0-High-Sierra.dmg
+
+xcrun altool --notarize-app --primary-bundle-id "de.hohnstaedt.xca.dmg" --username "christian@hohnstaedt.de" --password "@keychain:AC_PASSWORD" --asc-provider HWR8GSJ73M --file "$DMG"
+
+xcrun stapler staple "$DMG"
+
+xca.msi > Windows
+unzip xca-portable
+unzip xca-installer-dir > xca-portable
+execute xca.bat in xca-installer-dir
+cp xca.msi -> xca_build
+make xca.msi.signed
+mv xca.msi.signed ~/xca-2.4.0/xca-2.4.0.msi
+