diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d9acb97df..0e2a7a5f7 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -645,11 +645,11 @@ class Settings { /* {{{ */
 		if($node) {
 			$tab = $node[0]->attributes();
 			$this->_rootDir = strval($tab["rootDir"]);
+			$this->_rootDir = rtrim($this->_rootDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 			$this->_baseUrl = strval($tab["baseUrl"]);
 			$this->_httpRoot = strval($tab["httpRoot"]);
 			$this->_contentDir = strval($tab["contentDir"]);
-			if($this->_contentDir && substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
-				$this->_contentDir .= DIRECTORY_SEPARATOR;
+			$this->_contentDir = rtrim($this->_contentDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 			$this->_cacheDir = strval($tab["cacheDir"]);
 			$this->_stagingDir = strval($tab["stagingDir"]);
 			$this->_luceneDir = strval($tab["luceneDir"]);