diff --git a/ChangeLog b/ChangeLog
index 31c5b3fd7..2033d2be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-21	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/main.cpp:
+	only create core-application for --help and -h
+
 	* plugins/ladspa_effect/ladspa_effect.cpp:
 	* plugins/patman/patman.cpp:
 	* plugins/lb302/lb302.cpp:
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 80c4c702d..32c4a3fb5 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -87,7 +87,9 @@ int main( int argc, char * * argv )
 	for( int i = 1; i < argc; ++i )
 	{
 		if( argc > i && ( QString( argv[i] ) == "--render" ||
-						QString( argv[i] ) == "-r" ) )
+					QString( argv[i] ) == "-r" ) ||
+				( QString( argv[i] ) == "--help" ||
+						QString( argv[i] ) == "-h" ) )
 		{
 			core_only = TRUE;
 			break;