diff --git a/createrelease b/createrelease
index 47f9dd74ab2..e89cd5cdf04 100755
--- a/createrelease
+++ b/createrelease
@@ -47,6 +47,9 @@
 #
 # Create 2.18.x branch
 # git checkout -b 2.18.x ; git push -u origin 2.18.x
+# in fork:
+#  * add upstream: git remote add upstream git@github.com:danmar/cppcheck.git
+#  * add branch:   git fetch upstream 2.19.x
 #
 # Release notes:
 # - ensure safety critical issues are listed properly
@@ -127,28 +130,26 @@ cd ~/cppcheck
 git checkout $tag
 
 rm -rf upload
-mkdir -p upload
+mkdir -p upload/htdocs upload/frs
 
+# htdocs
 make clean
+make -j12
+rm -f cppcheck.cfg
+./cppcheck --version > upload/htdocs/version.txt
+# TODO manual, update version on webpage
 
-# Create archives..
+# frs
 git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/$releasename.tar.gz
 git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/$releasename.tar.bz2
 git archive --format=zip -9 --prefix=$releasename/ $tag > upload/$releasename.zip
+cp releasenotes.txt upload/frs/README.md
+# TODO msi
+
 cd upload
-scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
-rm $releasename.*
+scp frs/* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
+scp htdocs/* danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
 cd ..
-
-# Generate version.txt
-make -j12
-rm -f cppcheck.cfg
-./cppcheck --version > upload/version.txt
-
-cd ~/cppcheck/upload
-scp version.txt danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
-
-cd ~/cppcheck
 rm -rf upload
 
 # Local cppcheck binary