diff --git a/ChangeLog b/ChangeLog
index 4e94565ef..06f4deedc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-14	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* configure.in:
+	- removed single-source-compile-feature
+	- made FASTCALL-usage optional for the time being
+
 	* data/locale/de.ts:
 	* data/locale/de.qm:
 	updated German localization
diff --git a/configure.in b/configure.in
index e47c8f508..a34398793 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.4.0-svn20080106-mv, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080106-mv)
+AC_INIT(lmms, 0.4.0-svn20080114-mv, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080114-mv)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -453,33 +453,40 @@ else
 fi
 
 # check whether to disable single-source-compile
-AC_MSG_CHECKING([whether to enable 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([--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(no)
-fi
+#AC_ARG_ENABLE([ssc],
+#	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(no)
+#fi
 
 
 
 # check whether compiler of current platform supports attribute regparm(x)
-AC_MSG_CHECKING([whether we can use function-attribute regparm(x) on current platform])
-AH_TEMPLATE(FASTCALL, [Define to any attribute, speeding up function-calls])
-AC_RUN_IFELSE([	int  __attribute__((regparm(3))) foo( int a, int b, int c )
-			{ return( a=b=c ); }
-		int __attribute__((regparm(3))) main( void )
-			{ return( foo(2,1,0) ); }],
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(FASTCALL, [__attribute__((regparm(3)))]),
-	AC_MSG_RESULT(no)
+AC_ARG_ENABLE([fastcall],
+	AS_HELP_STRING([--enable-fastcall],
+		[enable fastcall (regparm-attribute)]), [ENABLE_FASTCALL=$enableval])
+if test "x$ENABLE_FASTCALL" = "xyes" ; then
+	AC_MSG_CHECKING([whether we can use function-attribute regparm(x) on current platform])
+	AH_TEMPLATE(FASTCALL, [Define to any attribute, speeding up function-calls])
+	AC_RUN_IFELSE([	int  __attribute__((regparm(3))) foo( int a, int b, int c )
+				{ return( a=b=c ); }
+			int __attribute__((regparm(3))) main( void )
+				{ return( foo(2,1,0) ); }],
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(FASTCALL, [__attribute__((regparm(3)))]),
+		AC_MSG_RESULT(no)
+		AC_DEFINE_UNQUOTED(FASTCALL,[])
+			)
+else
 	AC_DEFINE_UNQUOTED(FASTCALL,[])
-		)
+fi
 
 
 AC_MSG_CHECKING([whether floorf is known by compiler])