diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am
index 63119aec..eb96ebfe 100644
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -22,7 +22,7 @@ libExtraWINGs_a_SOURCES = 	\
 	wtableview.h \
 	wtabledelegates.h 
 
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 3ff80d6e..f8d12984 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -110,7 +110,7 @@ libWUtil_a_SOURCES = 	\
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
 
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 917ee3fa..fe6c0cdd 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -44,7 +44,7 @@ WPrefs_SOURCES = \
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
 
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
diff --git a/configure.ac b/configure.ac
index adfbd739..43c945e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,10 @@ dnl -----------------------
 asm_support=no
 mmx_support=no
 if test "$ac_cv_prog_gcc" = yes; then
+   
+    # gcc-3.4 complains about some of our stuff without this
+    NOSTRICTALIASING="-fno-strict-aliasing"
+
     x86=0
     changequote(,)dnl
     case "$host_cpu" in
@@ -224,7 +228,7 @@ if test "$ac_cv_prog_gcc" = yes; then
 
        AC_CACHE_CHECK(whether gcc supports MMX(tm) inline asm,
                       ac_cv_c_inline_mmx,
-                      [AC_TRY_LINK(,[__asm__ ("movq %mm0, %mm1");],
+                      [AC_TRY_LINK(,[asm ("movq %mm0, %mm1");],
                       ac_cv_c_inline_mmx=yes,
                       ac_cv_c_inline_mmx=no)])
 
@@ -234,6 +238,7 @@ if test "$ac_cv_prog_gcc" = yes; then
        fi
     fi
 fi
+AC_SUBST(NOSTRICTALIASING)
 
 
 dnl pkg-config
diff --git a/src/Makefile.am b/src/Makefile.am
index 3476125a..fe58aca1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,7 +108,7 @@ wmaker_SOURCES = 	\
 
 AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
 
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS = @NOSTRICTALIASING@
 
 
 INCLUDES = \