diff --git a/CMakeLists.txt b/CMakeLists.txt
index af3039af7cffcd21758db56e51df2cf5fc0d8a50..9cf93aab8ce2ba7c12ac2676207d435bd8f16187 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(BornAgain)
 # --- The version number ---
 set(BornAgain_VERSION_MAJOR 0)
 set(BornAgain_VERSION_MINOR 9)
-set(BornAgain_VERSION_PATCH 6)
+set(BornAgain_VERSION_PATCH 7)
 
 # --- General project settings ---
 option(BORNAGAIN_PYTHON "Build with python support" ON)
diff --git a/Core/Samples/inc/BAVersion.h b/Core/Samples/inc/BAVersion.h
new file mode 100644
index 0000000000000000000000000000000000000000..24bae37654fa5538c27adfce78b4862ba45a5d4e
--- /dev/null
+++ b/Core/Samples/inc/BAVersion.h
@@ -0,0 +1,50 @@
+// ************************************************************************** //
+//
+//  BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file      Samples/inc/BAVersion.h
+//! @brief     Defines functions for access to the package version number.
+//
+//! Homepage:  apps.jcns.fz-juelich.de/BornAgain
+//! License:   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2013
+//! @authors   Scientific Computing Group at MLZ Garching
+//! @authors   C. Durniak, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
+#ifndef BAVERSION_H_
+#define BAVERSION_H_
+
+
+#include <string>
+#include <sstream>
+
+namespace BornAgain {
+    const int major_version_number = 0;
+    const int minor_version_number = 9;
+    const int patch_version_number = 6;
+
+    inline int GetMajorVersionNumber() { return major_version_number; }
+    inline int GetMinorVersionNumber() { return minor_version_number; }
+    inline int GetPatchVersionNumber() { return patch_version_number; }
+    inline std::string GetName() { return std::string("BornAgain"); }
+
+    inline std::string GetVersionNumber()
+    {
+        std::ostringstream ostr;
+        ostr << major_version_number
+             << "."
+             << minor_version_number
+             << "."
+             << patch_version_number ;
+
+        return ostr.str();
+    }
+
+}
+
+
+
+#endif /* BAVERSION_H_ */
+
diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index dd4177987d9fc9034fd654284afd3c31b888a71a..a53af6fff21759b0d47e32326b07e7b26b9626b7 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -5,7 +5,7 @@ project(UserManual NONE)
 # user manual version number will be automatically propagated into tes
 set(UM_VERSION_MAJOR 0)
 set(UM_VERSION_MINOR 2)
-set(UM_VERSION_PATCH 4)
+set(UM_VERSION_PATCH 5)
 
 
 set(LATEX_COMPILER_FLAGS
diff --git a/dev-tools/release/make_release.py b/dev-tools/release/make_release.py
index 635c4b261f6717d6ca6c28fc668cd50e0a1f6d75..e75c75ded9db50b312f1a95766a99432869dc929 100644
--- a/dev-tools/release/make_release.py
+++ b/dev-tools/release/make_release.py
@@ -45,7 +45,6 @@ def get_manual_name():
         for line in fin:
             if "UM_VERSION" in line:
                 str = line.replace("(", "").replace(")", "")
-                #str = str.replace(")", "")
                 numbers.append([int(s) for s in str.split() if s.isdigit()][0])
     return "UserManual-%s.%s.%s.pdf" % (numbers[0], numbers[1], numbers[2])
 
@@ -106,6 +105,7 @@ def update_upload_dir():
     print "Updating directory for upload ..."
     run_command("mv %s/BornAgain*.tar.gz %s/old" % (get_upload_dir(), get_upload_dir()))
     run_command("mv %s/BornAgain*-win32.exe %s/old" % (get_upload_dir(), get_upload_dir()))
+    run_command("mv %s/UserManual-*.pdf %s/old" % (get_upload_dir(), get_upload_dir()))
     run_command("cp %s/BornAgain-%s.tar.gz %s" % (get_build_dir(), get_version(), get_upload_dir()))
     run_command("cp %s/CHANGELOG %s" % (get_source_dir(), get_upload_dir()))
     run_command("cp %s/Doc/UserManual/UserManual.pdf %s/%s" % (get_build_dir(), get_upload_dir(), get_manual_name()) )