diff --git a/ChangeLog b/ChangeLog
index 60a66f403..ebfc10607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-11	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* Makefile.cvs:
+	small makefile to be run before configure for creating/copying all
+	neccessary files
+
+	* config.sub:
+	* config.guess:
+	* configure:
+	* config.h.in:
+	* ltmain.sh:
+	removed
+
 2006-08-14	Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
 	* Makefile.am:
 	* include/ladspa_effect.h:
diff --git a/Makefile.cvs b/Makefile.cvs
new file mode 100644
index 000000000..425f7e4c2
--- /dev/null
+++ b/Makefile.cvs
@@ -0,0 +1,22 @@
+all:
+	@echo
+	@echo Creating neccessary files for configuring and building LMMS
+	@echo
+	@echo \ \* Creating aclocal.m4
+	@aclocal
+	@echo \ \* Running libtoolize
+	@libtoolize -c -f
+	@echo \ \* Creating config.h.in
+	@autoheader
+	@echo \ \* Creating Makefile templates
+	@automake
+	@echo \ \* Creating configure
+	@autoconf
+	@echo \ \* Cleaning up
+	@rm -rf autom4te.cache/
+	@echo
+	@echo ...done\! If something failed make sure you\'ve installed autoconf,
+	@echo automake and libtool.
+	@echo Otherwise you can run now configure \(if you did not so far\) and then make.
+	@echo
+
diff --git a/configure.in b/configure.in
index 97c97ad30..187bc38b2 100644
--- a/configure.in
+++ b/configure.in
@@ -16,11 +16,11 @@ AC_PROG_LIBTOOL
 
 # -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06
 #EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
-EXTRAFLAGS="-floop-optimize2 -fgcse-sm  -fgcse-las"
+EXTRAFLAGS="" #"-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
-	EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -ftree-loop-linear"
+	EXTRAFLAGS="$EXTRAFLAGS -floop-optimize2 -ftree-vectorize -ftree-loop-linear"
 	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" != "x0" ; then
 		EXTRAFLAGS="$EXTRAFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
 	fi