diff --git a/ChangeLog b/ChangeLog
index dabd958c3..1292d7833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
+2008-08-20	dieEasy <dieeasy/at/cheapnet/dot/it>
+
+	* data/locale/it.qm:
+	* data/locale/it.ts:
+	updated Italian localization-file
+
 2008-08-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/sid/sid_instrument.h:
+	* plugins/sid/test.png:
+	* plugins/sid/sid_instrument.cpp:
+	* plugins/sid/testred.png:
+	integrated patch by Csaba Hruska
+
+	* src/core/plugin.cpp:
+	fixed messages
+
+	* src/core/config_mgr.cpp:
+	add trailing slashes to paths where neccessary (closes #2056353)
+
+	* data/locale/de.qm:
+	* data/locale/de.ts:
+	updated German localization file and fixed various messages
+
 	* include/track.h:
 	* include/track_label_button.h:
 	* src/tracks/bb_track.cpp:
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 097d82fb0..7493ac7eb 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -36,6 +36,15 @@
 #include "main_window.h"
 
 
+static inline QString ensureTrailingSlash( const QString & _s )
+{
+	if( _s.right( 1 ) != QDir::separator() )
+	{
+		return( _s + QDir::separator() );
+	}
+	return( _s );
+}
+
 
 configManager * configManager::s_instanceOfMe = NULL;
 
@@ -44,7 +53,7 @@ configManager::configManager( void ) :
 	m_lmmsRcFile( QDir::home().absolutePath() + QDir::separator() +
 								".lmmsrc.xml" ),
 	m_workingDir( QDir::home().absolutePath() + QDir::separator() +
-								"lmms" ),
+						"lmms" + QDir::separator() ),
 	m_dataDir( qApp->applicationDirPath()
 #ifdef LMMS_BUILD_WIN32
 			+ QDir::separator() + "data" + QDir::separator()
@@ -77,7 +86,7 @@ configManager::~configManager()
 
 void configManager::setWorkingDir( const QString & _wd )
 {
-	m_workingDir = _wd;
+	m_workingDir = ensureTrailingSlash( _wd );
 }
 
 
@@ -85,7 +94,7 @@ void configManager::setWorkingDir( const QString & _wd )
 
 void configManager::setVSTDir( const QString & _vd )
 {
-	m_vstDir = _vd;
+	m_vstDir = ensureTrailingSlash( _vd );
 }
 
 
@@ -93,7 +102,7 @@ void configManager::setVSTDir( const QString & _vd )
 
 void configManager::setArtworkDir( const QString & _ad )
 {
-	m_artworkDir = _ad;
+	m_artworkDir = ensureTrailingSlash( _ad );
 }
 
 
@@ -101,7 +110,7 @@ void configManager::setArtworkDir( const QString & _ad )
 
 void configManager::setFLDir( const QString & _fd )
 {
-	m_flDir = _fd;
+	m_flDir = ensureTrailingSlash( _fd );
 }
 
 
@@ -118,7 +127,7 @@ void configManager::setLADSPADir( const QString & _fd )
 void configManager::setSTKDir( const QString & _fd )
 {
 #ifdef LMMS_HAVE_STK
-	m_stkDir = _fd;
+	m_stkDir = ensureTrailingSlash( _fd );
 #endif
 }
 
@@ -254,22 +263,22 @@ bool configManager::loadConfigFile( void )
 			m_artworkDir += QDir::separator();
 		}
 	}
-	m_workingDir = value( "paths", "workingdir" );
-	m_vstDir = value( "paths", "vstdir" );
-	m_flDir = value( "paths", "fldir" );
-	m_ladDir = value( "paths", "laddir" );
+	setWorkingDir( value( "paths", "workingdir" ) );
+	setVSTDir( value( "paths", "vstdir" ) );
+	setFLDir( value( "paths", "fldir" ) );
+	setLADSPADir( value( "paths", "laddir" ) );
 #ifdef LMMS_HAVE_STK
-	m_stkDir = value( "paths", "stkdir" );
+	setSTKDir( value( "paths", "stkdir" ) );
 #endif
 
 	if( m_vstDir == "" )
 	{
-		m_vstDir = QDir::home().absolutePath();
+		m_vstDir = ensureTrailingSlash( QDir::home().absolutePath() );
 	}
 
 	if( m_flDir == "" )
 	{
-		m_flDir = QDir::home().absolutePath();
+		m_flDir = ensureTrailingSlash( QDir::home().absolutePath() );
 	}
 
 	if( m_ladDir == "" )