diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000000..8a72d327fab
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,21 @@
+#   BAREOS® - Backup Archiving REcovery Open Sourced
+#
+#   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+#
+#   This program is Free Software; you can redistribute it and/or
+#   modify it under the terms of version three of the GNU Affero General Public
+#   License as published by the Free Software Foundation and included
+#   in the file LICENSE.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+#   02110-1301, USA.
+cmake_minimum_required(VERSION 3.0)
+add_subdirectory(core)
+add_subdirectory(webui)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 18bf7332c76..78f5cdf9a8b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -65,8 +65,8 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 # run git-info to collect sourcecode info
 file(MAKE_DIRECTORY build)
 execute_process(
-    COMMAND ${CMAKE_SOURCE_DIR}/scripts/git-info.sh
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build
+    COMMAND ${PROJECT_SOURCE_DIR}/scripts/git-info.sh
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/build
 )
 
 INCLUDE(BareosExtractVersionInfo)
@@ -131,21 +131,21 @@ endif()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/include
-      ${CMAKE_SOURCE_DIR}/src/win32/compat/include
+      ${PROJECT_SOURCE_DIR}/src/win32/include
+      ${PROJECT_SOURCE_DIR}/src/win32/compat/include
       )
 
    set(HAVE_WIN32 1)
 
    set(WINDOWS_LIBRARIES ws2_32)
 
-   SET(PYTHON_LIBRARIES ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}/python27.dll )
-   SET(PYTHON_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include)
+   SET(PYTHON_LIBRARIES ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}/python27.dll )
+   SET(PYTHON_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include)
    SET(HAVE_PYTHON 1)
 
-   SET(PostgreSQL_LIBRARY ${CMAKE_SOURCE_DIR}/src/win32/cats/pgsql/lib/${WINDOWS_BITS}/libpq.dll)
-   SET(PostgreSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/win32/cats/pgsql/include)
-   SET(PostgreSQL_TYPE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include)
+   SET(PostgreSQL_LIBRARY ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/lib/${WINDOWS_BITS}/libpq.dll)
+   SET(PostgreSQL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/include)
+   SET(PostgreSQL_TYPE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include)
 
 
 else()
@@ -248,7 +248,7 @@ ENDIF()
 
 MESSAGE( STATUS "VERSION: " ${CMAKE_MATCH_1} )
 
-MESSAGE( STATUS "CMAKE_SOURCE_DIR:         " ${CMAKE_SOURCE_DIR} )
+MESSAGE( STATUS "PROJECT_SOURCE_DIR:         " ${PROJECT_SOURCE_DIR} )
 
 
 # needed for check_include
@@ -267,7 +267,7 @@ include_directories(${PYTHON_INCLUDE_DIRS})
 
 include_directories(${PYTHON_INCLUDE_PATH})
 
-include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${PROJECT_SOURCE_DIR}/src)
 
 # trick for socklen_t
 set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
@@ -285,7 +285,7 @@ set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
 # /*	C++ comment style not allowed	*/
 
 
-# if you are building in-source, this is the same as CMAKE_SOURCE_DIR, otherwise
+# if you are building in-source, this is the same as PROJECT_SOURCE_DIR, otherwise
 # this is the top level directory of your build tree
 MESSAGE( STATUS "CMAKE_BINARY_DIR:         " ${CMAKE_BINARY_DIR} )
 
@@ -294,7 +294,7 @@ MESSAGE( STATUS "CMAKE_BINARY_DIR:         " ${CMAKE_BINARY_DIR} )
 MESSAGE( STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR} )
 
 # this is the directory, from which cmake was started, i.e. the top level source directory
-MESSAGE( STATUS "CMAKE_SOURCE_DIR:         " ${CMAKE_SOURCE_DIR} )
+MESSAGE( STATUS "PROJECT_SOURCE_DIR:         " ${PROJECT_SOURCE_DIR} )
 
 # this is the directory where the currently processed CMakeLists.txt is located in
 MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} )
diff --git a/core/cmake/BareosCheckFunctions.cmake b/core/cmake/BareosCheckFunctions.cmake
index 4fe1cc8e993..3a9aceae005 100644
--- a/core/cmake/BareosCheckFunctions.cmake
+++ b/core/cmake/BareosCheckFunctions.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosCheckIncludes.cmake b/core/cmake/BareosCheckIncludes.cmake
index 87d9e57955e..b0431df275a 100644
--- a/core/cmake/BareosCheckIncludes.cmake
+++ b/core/cmake/BareosCheckIncludes.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosCheckStructHasMembers.cmake b/core/cmake/BareosCheckStructHasMembers.cmake
index 5e5a22e3f18..0a942f8887d 100644
--- a/core/cmake/BareosCheckStructHasMembers.cmake
+++ b/core/cmake/BareosCheckStructHasMembers.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosCheckSymbols.cmake b/core/cmake/BareosCheckSymbols.cmake
index ea76e1d0ca7..7ddb95d9fc5 100644
--- a/core/cmake/BareosCheckSymbols.cmake
+++ b/core/cmake/BareosCheckSymbols.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosConfigureFile.cmake b/core/cmake/BareosConfigureFile.cmake
index 5ed226fc990..fe3d1acb755 100644
--- a/core/cmake/BareosConfigureFile.cmake
+++ b/core/cmake/BareosConfigureFile.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake b/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake
index 2977ec43238..91fd6ac15a1 100644
--- a/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake
+++ b/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosExtractVersionInfo.cmake b/core/cmake/BareosExtractVersionInfo.cmake
index 7146a3729d1..cd0d35de2ac 100644
--- a/core/cmake/BareosExtractVersionInfo.cmake
+++ b/core/cmake/BareosExtractVersionInfo.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -19,17 +19,17 @@
 
 
 # extract version number from version.h
-file(STRINGS ${CMAKE_SOURCE_DIR}/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
+file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
 string(REGEX MATCH [0-9.]+ VERSION ${VERSION_INFO})
 string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_INFO})
 string(REGEX MATCH \".*\" FULLVERSION ${VERSION_INFO})
 
 # extract date from version.h
-file(STRINGS ${CMAKE_SOURCE_DIR}/src/include/version.h DATE_INFO REGEX define.*BDATE.*)
+file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h DATE_INFO REGEX define.*BDATE.*)
 string(REGEX MATCH \".*\" DATE ${DATE_INFO})
 string(REGEX REPLACE "\"" "" DATE ${DATE})
 
 
 # extract  db version from cats.h
-file(STRINGS ${CMAKE_SOURCE_DIR}/src/cats/cats.h DB_VERSION_INFO REGEX .*BDB_VERSION.*)
+file(STRINGS ${PROJECT_SOURCE_DIR}/src/cats/cats.h DB_VERSION_INFO REGEX .*BDB_VERSION.*)
 string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_INFO})
diff --git a/core/cmake/BareosFindAllLibraries.cmake b/core/cmake/BareosFindAllLibraries.cmake
index 44c58d016c4..daf6071193c 100644
--- a/core/cmake/BareosFindAllLibraries.cmake
+++ b/core/cmake/BareosFindAllLibraries.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosFindLibrary.cmake b/core/cmake/BareosFindLibrary.cmake
index c61e1958ab3..c1e4e1cf28b 100644
--- a/core/cmake/BareosFindLibrary.cmake
+++ b/core/cmake/BareosFindLibrary.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosFindLibraryAndHeaders.cmake b/core/cmake/BareosFindLibraryAndHeaders.cmake
index 067190e3b2d..d5b4ac54ee4 100644
--- a/core/cmake/BareosFindLibraryAndHeaders.cmake
+++ b/core/cmake/BareosFindLibraryAndHeaders.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosFindPrograms.cmake b/core/cmake/BareosFindPrograms.cmake
index 8e9f81eb30f..67cc9666f4a 100644
--- a/core/cmake/BareosFindPrograms.cmake
+++ b/core/cmake/BareosFindPrograms.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosGenerateDebianInfo.cmake b/core/cmake/BareosGenerateDebianInfo.cmake
index 7ad97503aa4..61bc7b2649f 100644
--- a/core/cmake/BareosGenerateDebianInfo.cmake
+++ b/core/cmake/BareosGenerateDebianInfo.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2018-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2018-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosGetDistInfo.cmake b/core/cmake/BareosGetDistInfo.cmake
index 56d68dcc7d7..746e2224132 100644
--- a/core/cmake/BareosGetDistInfo.cmake
+++ b/core/cmake/BareosGetDistInfo.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosInstallConfigFiles.cmake b/core/cmake/BareosInstallConfigFiles.cmake
index 4d8dd7c5ebb..519950d4c92 100644
--- a/core/cmake/BareosInstallConfigFiles.cmake
+++ b/core/cmake/BareosInstallConfigFiles.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosSetVariableDefaults.cmake b/core/cmake/BareosSetVariableDefaults.cmake
index 1fbe34d028e..15811fe2a2c 100644
--- a/core/cmake/BareosSetVariableDefaults.cmake
+++ b/core/cmake/BareosSetVariableDefaults.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/BareosTypeSizes.cmake b/core/cmake/BareosTypeSizes.cmake
index cd5b84820e6..74db1a87060 100644
--- a/core/cmake/BareosTypeSizes.cmake
+++ b/core/cmake/BareosTypeSizes.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/CodeCoverage.cmake b/core/cmake/CodeCoverage.cmake
index ac10775c2bc..38ac972242b 100644
--- a/core/cmake/CodeCoverage.cmake
+++ b/core/cmake/CodeCoverage.cmake
@@ -72,7 +72,7 @@ include(CMakeParseArguments)
 find_program( GCOV_PATH gcov )
 find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
 find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program( GCOVR_PATH gcovr PATHS ${PROJECT_SOURCE_DIR}/scripts/test)
 find_program( SIMPLE_PYTHON_EXECUTABLE python )
 
 if(NOT GCOV_PATH)
@@ -216,7 +216,7 @@ function(SETUP_TARGET_FOR_COVERAGE_COBERTURA)
         ${Coverage_EXECUTABLE}
 
         # Running gcovr
-        COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} ${COBERTURA_EXCLUDES}
+        COMMAND ${GCOVR_PATH} -x -r ${PROJECT_SOURCE_DIR} ${COBERTURA_EXCLUDES}
             -o ${Coverage_NAME}.xml
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         DEPENDS ${Coverage_DEPENDENCIES}
diff --git a/core/cmake/bareos-symlink-default-db-backend.cmake b/core/cmake/bareos-symlink-default-db-backend.cmake
index 157a8ceb794..0edb8ff64ae 100644
--- a/core/cmake/bareos-symlink-default-db-backend.cmake
+++ b/core/cmake/bareos-symlink-default-db-backend.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/install-dird-configfiles.cmake b/core/cmake/install-dird-configfiles.cmake
index 9b0b9ec89ba..1b801178200 100644
--- a/core/cmake/install-dird-configfiles.cmake
+++ b/core/cmake/install-dird-configfiles.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/install-filed-configfiles.cmake b/core/cmake/install-filed-configfiles.cmake
index c3539c49e44..8aa26d37b0b 100644
--- a/core/cmake/install-filed-configfiles.cmake
+++ b/core/cmake/install-filed-configfiles.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/install-stored-configfiles.cmake b/core/cmake/install-stored-configfiles.cmake
index 0df0757a332..82ae83a64c7 100644
--- a/core/cmake/install-stored-configfiles.cmake
+++ b/core/cmake/install-stored-configfiles.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/cmake/install-tray-monitor-configfiles.cmake b/core/cmake/install-tray-monitor-configfiles.cmake
index 8d94b34e6b4..4ea50cb7179 100644
--- a/core/cmake/install-tray-monitor-configfiles.cmake
+++ b/core/cmake/install-tray-monitor-configfiles.cmake
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/manpages/CMakeLists.txt b/core/manpages/CMakeLists.txt
index 731ea14fc61..18c35a40e91 100644
--- a/core/manpages/CMakeLists.txt
+++ b/core/manpages/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/CMakeLists.txt b/core/platforms/CMakeLists.txt
index de338e371bc..a2f42585516 100644
--- a/core/platforms/CMakeLists.txt
+++ b/core/platforms/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/debian/CMakeLists.txt b/core/platforms/debian/CMakeLists.txt
index 52ab5a0a333..65be321fa53 100644
--- a/core/platforms/debian/CMakeLists.txt
+++ b/core/platforms/debian/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/freebsd/CMakeLists.txt b/core/platforms/freebsd/CMakeLists.txt
index ac693c82f8f..b2e2f1f7d69 100644
--- a/core/platforms/freebsd/CMakeLists.txt
+++ b/core/platforms/freebsd/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2018-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2018-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/redhat/CMakeLists.txt b/core/platforms/redhat/CMakeLists.txt
index fcf2a017801..b7fd140b144 100644
--- a/core/platforms/redhat/CMakeLists.txt
+++ b/core/platforms/redhat/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/solaris/CMakeLists.txt b/core/platforms/solaris/CMakeLists.txt
index fcf2a017801..b7fd140b144 100644
--- a/core/platforms/solaris/CMakeLists.txt
+++ b/core/platforms/solaris/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/suse/CMakeLists.txt b/core/platforms/suse/CMakeLists.txt
index 3bd662529da..f18ea150f57 100644
--- a/core/platforms/suse/CMakeLists.txt
+++ b/core/platforms/suse/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/systemd/CMakeLists.txt b/core/platforms/systemd/CMakeLists.txt
index c51ab57b135..7ff2625a129 100644
--- a/core/platforms/systemd/CMakeLists.txt
+++ b/core/platforms/systemd/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/platforms/univention/CMakeLists.txt b/core/platforms/univention/CMakeLists.txt
index 52ab5a0a333..65be321fa53 100644
--- a/core/platforms/univention/CMakeLists.txt
+++ b/core/platforms/univention/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/scripts/CMakeLists.txt b/core/scripts/CMakeLists.txt
index 71e021db289..03c8d6bd1d8 100644
--- a/core/scripts/CMakeLists.txt
+++ b/core/scripts/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
index 50625c6001e..5866a28a853 100644
--- a/core/src/CMakeLists.txt
+++ b/core/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/cats/CMakeLists.txt b/core/src/cats/CMakeLists.txt
index 070c6a58156..e0294374975 100644
--- a/core/src/cats/CMakeLists.txt
+++ b/core/src/cats/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -136,5 +136,5 @@ IF(${nr_db_backends} EQUAL 1)
    install(CODE "set(VERSION \"${VERSION}\")")
    install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
 
-   INSTALL(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/bareos-symlink-default-db-backend.cmake)
+   INSTALL(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/bareos-symlink-default-db-backend.cmake)
 ENDIF()
diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt
index fc04e994f90..934ccceaa06 100644
--- a/core/src/console/CMakeLists.txt
+++ b/core/src/console/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/dird/CMakeLists.txt b/core/src/dird/CMakeLists.txt
index 8d9eb711b84..f5e2e92e07e 100644
--- a/core/src/dird/CMakeLists.txt
+++ b/core/src/dird/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -47,7 +47,7 @@ IF(HAVE_PAM)
 ENDIF()
 
 IF(HAVE_WIN32)
-   include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/dird)
+   include_directories(${PROJECT_SOURCE_DIR}/src/win32/generic ${PROJECT_SOURCE_DIR}/src/win32/dird)
    LIST(APPEND DIRDSRCS
       ../win32/generic/main.cc
       ../win32/generic/service.cc
@@ -108,4 +108,4 @@ install(CODE "set(BACKENDS \"${BACKENDS}\")")
 install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
 install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
 
-install(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/install-dird-configfiles.cmake)
+install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-dird-configfiles.cmake)
diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt
index dd7675c0d20..403ee5ecc73 100644
--- a/core/src/filed/CMakeLists.txt
+++ b/core/src/filed/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -20,9 +20,9 @@
 
 IF(HAVE_WIN32)
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/generic
-      ${CMAKE_SOURCE_DIR}/src/win32/filed
-      ${CMAKE_SOURCE_DIR}/src/win32/vss/include
+      ${PROJECT_SOURCE_DIR}/src/win32/generic
+      ${PROJECT_SOURCE_DIR}/src/win32/filed
+      ${PROJECT_SOURCE_DIR}/src/win32/vss/include
       )
 ENDIF()
 
@@ -79,4 +79,4 @@ install(CODE "set(PLUGINS \"${PLUGINS}\")")
 install(CODE "set(BACKENDS \"${BACKENDS}\")")
 install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
 install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
-install(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/install-filed-configfiles.cmake)
+install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-filed-configfiles.cmake)
diff --git a/core/src/findlib/CMakeLists.txt b/core/src/findlib/CMakeLists.txt
index 7bbb0f6df3d..0be19c47993 100644
--- a/core/src/findlib/CMakeLists.txt
+++ b/core/src/findlib/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/findlib/unittests/CMakeLists.txt b/core/src/findlib/unittests/CMakeLists.txt
index f38cd04b245..7c42418beff 100644
--- a/core/src/findlib/unittests/CMakeLists.txt
+++ b/core/src/findlib/unittests/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
index 58d0c96edf9..bbb2af277ae 100644
--- a/core/src/lib/CMakeLists.txt
+++ b/core/src/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/lmdb/CMakeLists.txt b/core/src/lmdb/CMakeLists.txt
index f59a9a2d41c..29153a2c185 100644
--- a/core/src/lmdb/CMakeLists.txt
+++ b/core/src/lmdb/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/ndmp/CMakeLists.txt b/core/src/ndmp/CMakeLists.txt
index a1b0d5048b8..3dbf746b65a 100644
--- a/core/src/ndmp/CMakeLists.txt
+++ b/core/src/ndmp/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/plugins/CMakeLists.txt b/core/src/plugins/CMakeLists.txt
index 1e61cc6f4f2..18288abf210 100644
--- a/core/src/plugins/CMakeLists.txt
+++ b/core/src/plugins/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/plugins/dird/CMakeLists.txt b/core/src/plugins/dird/CMakeLists.txt
index 6908def58ff..7e6d4399035 100644
--- a/core/src/plugins/dird/CMakeLists.txt
+++ b/core/src/plugins/dird/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -20,11 +20,11 @@
 
 IF(HAVE_WIN32)
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/generic
-      ${CMAKE_SOURCE_DIR}/src/win32/dird
-      ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include
+      ${PROJECT_SOURCE_DIR}/src/win32/generic
+      ${PROJECT_SOURCE_DIR}/src/win32/dird
+      ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include
       )
-   link_directories(${CMAKE_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
+   link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
    add_definitions(-DMS_WIN${WINDOWS_BITS})
 ENDIF()
 
diff --git a/core/src/plugins/filed/CMakeLists.txt b/core/src/plugins/filed/CMakeLists.txt
index 953caeb5b1c..676ef61b4c0 100644
--- a/core/src/plugins/filed/CMakeLists.txt
+++ b/core/src/plugins/filed/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -19,20 +19,20 @@
 
 IF(HAVE_WIN32)
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32
-      ${CMAKE_SOURCE_DIR}/src/win32/include
-      ${CMAKE_SOURCE_DIR}/src/win32/filed
-      ${CMAKE_SOURCE_DIR}/src/win32/plugins/filed
-      ${CMAKE_SOURCE_DIR}/src/win32/compat/include
-      ${CMAKE_SOURCE_DIR}/src/win32/vdi/include
-      ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include
-      ${CMAKE_SOURCE_DIR}/src/include
-      ${CMAKE_SOURCE_DIR}/src
-      ${CMAKE_SOURCE_DIR}/src/filed
-      ${CMAKE_SOURCE_DIR}/src/plugins/filed
+      ${PROJECT_SOURCE_DIR}/src/win32
+      ${PROJECT_SOURCE_DIR}/src/win32/include
+      ${PROJECT_SOURCE_DIR}/src/win32/filed
+      ${PROJECT_SOURCE_DIR}/src/win32/plugins/filed
+      ${PROJECT_SOURCE_DIR}/src/win32/compat/include
+      ${PROJECT_SOURCE_DIR}/src/win32/vdi/include
+      ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include
+      ${PROJECT_SOURCE_DIR}/src/include
+      ${PROJECT_SOURCE_DIR}/src
+      ${PROJECT_SOURCE_DIR}/src/filed
+      ${PROJECT_SOURCE_DIR}/src/plugins/filed
       )
 
-   link_directories(${CMAKE_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
+   link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
    add_definitions(-DMS_WIN${WINDOWS_BITS})
 ELSE()
    include_directories(/usr/include/python2.7)
diff --git a/core/src/plugins/stored/CMakeLists.txt b/core/src/plugins/stored/CMakeLists.txt
index 2006ab39c87..34ebd59dd61 100644
--- a/core/src/plugins/stored/CMakeLists.txt
+++ b/core/src/plugins/stored/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -19,11 +19,11 @@
 
 IF(HAVE_WIN32)
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/generic
-      ${CMAKE_SOURCE_DIR}/src/win32/stored
-      ${CMAKE_SOURCE_DIR}/src/win32/plugins/python/include
+      ${PROJECT_SOURCE_DIR}/src/win32/generic
+      ${PROJECT_SOURCE_DIR}/src/win32/stored
+      ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include
       )
-   link_directories(${CMAKE_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
+   link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS})
    add_definitions(-DMS_WIN${WINDOWS_BITS})
 ENDIF()
 
diff --git a/core/src/qt-tray-monitor/CMakeLists.txt b/core/src/qt-tray-monitor/CMakeLists.txt
index 02ec970713c..a1a67b15aef 100644
--- a/core/src/qt-tray-monitor/CMakeLists.txt
+++ b/core/src/qt-tray-monitor/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -35,8 +35,8 @@ find_package(Qt5 COMPONENTS Core Widgets)
 
 IF(HAVE_WIN32)
    include_directories(
-      ${CMAKE_SOURCE_DIR}/src/win32/include
-      ${CMAKE_SOURCE_DIR}/src/win32/lib
+      ${PROJECT_SOURCE_DIR}/src/win32/include
+      ${PROJECT_SOURCE_DIR}/src/win32/lib
       )
 ENDIF()
 
@@ -76,7 +76,7 @@ install(CODE "set(BACKENDS \"${BACKENDS}\")")
 install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
 install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
 
-INSTALL(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/install-tray-monitor-configfiles.cmake)
+INSTALL(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-tray-monitor-configfiles.cmake)
 
 INSTALL(FILES bareos-tray-monitor.desktop DESTINATION ${datarootdir}/applications/)
 INSTALL(FILES bareos-tray-monitor.desktop DESTINATION ${sysconfdir}/xdg/autostart/ )
diff --git a/core/src/stored/CMakeLists.txt b/core/src/stored/CMakeLists.txt
index 2a3b5e6dc86..13444ebfbc3 100644
--- a/core/src/stored/CMakeLists.txt
+++ b/core/src/stored/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -18,7 +18,7 @@
 #   02110-1301, USA.
 
 IF(HAVE_WIN32)
-   include_directories(${CMAKE_SOURCE_DIR}/src/win32/generic ${CMAKE_SOURCE_DIR}/src/win32/stored  ${CMAKE_SOURCE_DIR}/src/stored/backends)
+   include_directories(${PROJECT_SOURCE_DIR}/src/win32/generic ${PROJECT_SOURCE_DIR}/src/win32/stored  ${PROJECT_SOURCE_DIR}/src/stored/backends)
 ENDIF()
 
 if(NOT ${HAVE_DYNAMIC_SD_BACKENDS})
@@ -29,9 +29,9 @@ if(NOT ${HAVE_DYNAMIC_SD_BACKENDS})
 
    IF(HAVE_WIN32)
       LIST(APPEND AVAILABLE_DEVICE_API_SRCS
-         ${CMAKE_SOURCE_DIR}/src/win32/stored/backends/win32_fifo_device.cc
-         ${CMAKE_SOURCE_DIR}/src/win32/stored/backends/win32_file_device.cc
-         ${CMAKE_SOURCE_DIR}/src/win32/stored/backends/win32_tape_device.cc
+         ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_fifo_device.cc
+         ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_file_device.cc
+         ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_tape_device.cc
          )
    ELSE()
       LIST(APPEND AVAILABLE_DEVICE_API_SRCS
@@ -224,8 +224,8 @@ INSTALL(TARGETS bareos-sd bls bextract bscan btape bcopy DESTINATION "${sbindir}
 install(CODE "set(PLUGINS \"${PLUGINS}\")")
 install(CODE "set(BACKENDS \"${BACKENDS}\")")
 install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
-install(CODE "set(SRC_DIR \"${CMAKE_SOURCE_DIR}\")")
-install(SCRIPT ${CMAKE_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
+install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
+install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
 
 INSTALL(DIRECTORY DESTINATION "../${archivedir}")
 
diff --git a/core/src/stored/backends/CMakeLists.txt b/core/src/stored/backends/CMakeLists.txt
index 3b0ddf57662..eb9153d0da7 100644
--- a/core/src/stored/backends/CMakeLists.txt
+++ b/core/src/stored/backends/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2018 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
index f74801802e7..c59c3c50afc 100644
--- a/core/src/tests/CMakeLists.txt
+++ b/core/src/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -47,10 +47,10 @@ ENDIF()
 add_definitions(-DTEST_SMALL_HTABLE)
 
 # where to find the certificates
-add_definitions(-DCERTDIR=\"${CMAKE_SOURCE_DIR}/../regress/configs/BASE/tls\")
+add_definitions(-DCERTDIR=\"${PROJECT_SOURCE_DIR}/../regress/configs/BASE/tls\")
 
 # where to find the source dir
-add_definitions(-DCMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\")
+add_definitions(-DPROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\")
 
 ####### test_lib ###############################
 add_executable(test_lib
diff --git a/core/src/tests/bsock_test_connection_setup.cc b/core/src/tests/bsock_test_connection_setup.cc
index 9a24c0a5f9a..66e438d0a63 100644
--- a/core/src/tests/bsock_test_connection_setup.cc
+++ b/core/src/tests/bsock_test_connection_setup.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2018-2018 Bareos GmbH & Co. KG
+   Copyright (C) 2018-2019 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -182,7 +182,7 @@ static bool do_connection_test(std::string path_to_config, TlsPolicy tls_policy)
 TEST(bsock, console_director_connection_test_tls_psk)
 {
    InitOpenSsl();
-   do_connection_test(std::string(CMAKE_SOURCE_DIR
+   do_connection_test(std::string(PROJECT_SOURCE_DIR
                                   "/src/tests/configs/console-director/tls_psk_default_enabled/"),
                                   TlsPolicy::kBnetTlsEnabled);
 }
@@ -190,7 +190,7 @@ TEST(bsock, console_director_connection_test_tls_psk)
 TEST(bsock, console_director_connection_test_cleartext)
 {
    InitOpenSsl();
-   do_connection_test(std::string(CMAKE_SOURCE_DIR
+   do_connection_test(std::string(PROJECT_SOURCE_DIR
                                   "/src/tests/configs/console-director/tls_disabled/"),
                                   TlsPolicy::kBnetTlsNone);
 }
diff --git a/core/src/tools/CMakeLists.txt b/core/src/tools/CMakeLists.txt
index b831357bbb1..ff0957cb613 100644
--- a/core/src/tools/CMakeLists.txt
+++ b/core/src/tools/CMakeLists.txt
@@ -1,6 +1,6 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2017 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt
index d67777db316..8d18e102665 100644
--- a/webui/CMakeLists.txt
+++ b/webui/CMakeLists.txt
@@ -1,4 +1,4 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
 #   Copyright (C) 2018-2019 Bareos GmbH & Co. KG
 #
diff --git a/webui/cmake/BareosExtractVersionInfo.cmake b/webui/cmake/BareosExtractVersionInfo.cmake
index a4a6f591386..db74aa67902 100644
--- a/webui/cmake/BareosExtractVersionInfo.cmake
+++ b/webui/cmake/BareosExtractVersionInfo.cmake
@@ -1,4 +1,4 @@
-#   BAREOS�� - Backup Archiving REcovery Open Sourced
+#   BAREOS® - Backup Archiving REcovery Open Sourced
 #
 #   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
 #
@@ -19,7 +19,7 @@
 
 
 # extract version number from version.h
-file(STRINGS ${CMAKE_SOURCE_DIR}/../core/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
+file(STRINGS ${PROJECT_SOURCE_DIR}/../core/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
 string(REGEX MATCH [0-9.]+ VERSION ${VERSION_INFO})
 string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_INFO})
 string(REGEX MATCH \".*\" FULLVERSION ${VERSION_INFO})