diff --git a/ChangeLog b/ChangeLog
index 406c87cfa..2194545e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/main.cpp:
+	do not show splash if environment variable NOSPLASH is set
+
+	* include/audio_portaudio.h:
+	* src/core/audio/audio_portaudio.cpp:
+	* src/core/audio/audio_pulseaudio.cpp:
 	* src/core/sample_buffer.cpp:
 	* src/core/sample_record_handle.cpp:
 	* src/tracks/sample_track.cpp:
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 7c07d8873..a54ba013f 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -29,6 +29,7 @@
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QLocale>
+#include <QtCore/QProcess>
 #include <QtCore/QTimer>
 #include <QtCore/QTranslator>
 #include <QtGui/QApplication>
@@ -373,7 +374,10 @@ int main( int argc, char * * argv )
 		ss->setAttribute( Qt::WA_PaintOnScreen, true );
 		ss->setMask( splash.alphaChannel().createMaskFromColor(
 							QColor( 0, 0, 0 ) ) );
-		//ss->show();
+		if( !QProcess::systemEnvironment().contains( "NOSPLASH=1" ) )
+		{
+			ss->show();
+		}
 		qApp->processEvents();
 
 		// init central engine which handles all components of LMMS