diff --git a/ChangeLog b/ChangeLog
index 7767f7c82..c213a2fdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-21	Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
+
+	* configure.in:
+	- removed -fomit-frame-pointer flag--causes wine to crash on
+	  Ubuntu
+	- added check for gcc 4.0 for optimization flags--left it
+	  commented out--needs to be tested with 4.1
+
 2006-07-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/tracks/automation_pattern.cpp:
diff --git a/configure.in b/configure.in
index 2aaf53553..92d13e55f 100644
--- a/configure.in
+++ b/configure.in
@@ -14,11 +14,17 @@ AC_PROG_LN_S
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
 
-EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
+# -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"
 
-#somehow enable this later
+# 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 -funsafe-loop-optimizations -Wunsafe-loop-optimizations -ftree-loop-linear"
+#	if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f2`" = "x0" ; then
+#		EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -ftree-loop-linear"
+#	else
+#		EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -funsafe-loop-optimizations -Wunsafe-loop-optimizations -ftree-loop-linear"
+#	fi	
 #fi
 CFLAGS="$CFLAGS $EXTRAFLAGS"
 CXXFLAGS="$CXXFLAGS $EXTRAFLAGS"