diff --git a/ChangeLog b/ChangeLog
index b93628d86..1f249be78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-17	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* configure.in:
+	- removed unsafe flags
+	- disabled single-source-compiling per default
+
 	* src/audio/audio_port.cpp:
 	initialize all member-variables in initialization-list of
 	audioPort-constructor - this way the audio-port isn't being added to
diff --git a/configure.in b/configure.in
index 2041a6d65..49f36b1a8 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1-svn20070716, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070716)
+AC_INIT(lmms, 0.2.1-svn20070717, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20070717)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -57,9 +57,9 @@ DEFAULTFLAGS="-O2 -g0 -fPIC" #"-floop-optimize2 -fgcse-sm  -fgcse-las"
 # Tested with GCC 4.0--needs to be tested with 4.1--Danny 7/21/06
 if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
 	DEFAULTFLAGS="$DEFAULTFLAGS -ftree-vectorize -ftree-loop-linear"
-	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" != "x0" ; then
-		DEFAULTFLAGS="$DEFAULTFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
-	fi	
+#	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" != "x0" ; then
+#		DEFAULTFLAGS="$DEFAULTFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
+#	fi	
 fi
 
 CFLAGS="$DEFAULTFLAGS $CFLAGS"
@@ -435,17 +435,17 @@ else
 fi
 
 # check whether to disable single-source-compile
-AC_MSG_CHECKING([whether to disable single-source-compile])
+AC_MSG_CHECKING([whether to enable single-source-compile])
 # AH_TEMPLATE(SINGLE_SOURCE_COMPILE, [Define if you want to enable single-source-compile.])
 AC_ARG_ENABLE([ssc],
-	AS_HELP_STRING([--disable-ssc],
-		[disable single-source-compile]), [ENABLE_SSC=$enableval])
-if test ! "x$ENABLE_SSC" = "xno" ; then
-	AC_MSG_RESULT(no)
+	AS_HELP_STRING([--enable-ssc],
+		[enable single-source-compile]), [ENABLE_SSC=$enableval])
+if test "x$ENABLE_SSC" = "xyes" ; then
+	AC_MSG_RESULT(yes)
 	# AC_DEFINE(SINGLE_SOURCE_COMPILE)
 	CXXFLAGS="$CXXFLAGS -DSINGLE_SOURCE_COMPILE"
 else
-	AC_MSG_RESULT(yes)
+	AC_MSG_RESULT(no)
 fi
 
 
diff --git a/plugins/midi_import/midi_import.h b/plugins/midi_import/midi_import.h
index 88cc48588..7d3973145 100644
--- a/plugins/midi_import/midi_import.h
+++ b/plugins/midi_import/midi_import.h
@@ -1,7 +1,7 @@
 /*
  * midi_import.h - support for importing MIDI-files
  *
- * Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *