diff --git a/ChangeLog b/ChangeLog
index 95d4e058b..5ef0207c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/vst_base/lvsl_client.cpp:
+	* plugins/vst_base/lvsl_server.cpp:
+	* plugins/vst_base/CMakeLists.txt:
+	fixed broken VST-support
+
 	* CMakeLists.txt:
 	completed information about packages needed for building VST support
 	on 64 bit machines (thanks to Stephane Thomas!)
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index 533aa199c..258020dcb 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -11,13 +11,13 @@ ENDIF(LMMS_HOST_X86_64)
 ADD_CUSTOM_COMMAND(
 		SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lvsl_server.cpp
 		COMMAND wineg++
-		ARGS -I${CMAKE_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_INSTALL_PREFIX}/include/wine/windows -I/usr/include/wine/windows ${CMAKE_CURRENT_SOURCE_DIR}/lvsl_server.cpp -mwindows -lpthread ${EXTRA_FLAGS} -o lvsl_server.exe.so
+		ARGS -I${CMAKE_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_INSTALL_PREFIX}/include/wine/windows -I/usr/include/wine/windows ${CMAKE_CURRENT_SOURCE_DIR}/lvsl_server.cpp -mwindows -lpthread ${EXTRA_FLAGS} -o lvsl_server
 		TARGET vstbase
 		OUTPUTS lvsl_server.exe.so
 		)
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES lvsl_server.exe.so)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lvsl_server.exe.so DESTINATION ${PLUGIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lvsl_server ${CMAKE_CURRENT_BINARY_DIR}/lvsl_server.exe.so DESTINATION ${PLUGIN_DIR})
 
 ENDIF(LMMS_HAVE_VST)
diff --git a/plugins/vst_base/lvsl_client.cpp b/plugins/vst_base/lvsl_client.cpp
index 1b12d01a0..b98c48bd6 100644
--- a/plugins/vst_base/lvsl_client.cpp
+++ b/plugins/vst_base/lvsl_client.cpp
@@ -115,7 +115,7 @@ remoteVSTPlugin::remoteVSTPlugin( const QString & _plugin ) :
 		execlp( lvsl_server_exec.toAscii().constData(),
 					lvsl_server_exec.toAscii().constData(),
 									NULL );
-		return;
+		exit( 0 );
 	}
 	m_serverInFD = m_pipes[1][0];
 	m_serverOutFD = m_pipes[0][1];
diff --git a/plugins/vst_base/lvsl_server.cpp b/plugins/vst_base/lvsl_server.cpp
index 7fe6c49d1..26d6fcf23 100644
--- a/plugins/vst_base/lvsl_server.cpp
+++ b/plugins/vst_base/lvsl_server.cpp
@@ -1068,7 +1068,7 @@ DWORD WINAPI VSTPlugin::guiEventLoop( LPVOID _param )
 		pthread_cond_signal( &_this->m_windowStatusChange );
 		return( 1 );
 	}
-	
+
 	if( ( _this->m_window = CreateWindowExA(
 				0, "LVSL", _this->m_shortName.c_str(),
 			       ( WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME &