diff --git a/acconfig.h b/acconfig.h
index 06394d0370..1cf61760cc 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -10,6 +10,7 @@
 #undef HAVE_LIBMMX
 #undef HAVE_XAUDIO
 #undef HAVE_CSSAUTH
+#undef HAVE_VORBIS
 #undef HAVE_NASM
 
 #undef HAVE_ATOMIC_H
diff --git a/configure.in b/configure.in
index feaf904007..6362d0952b 100644
--- a/configure.in
+++ b/configure.in
@@ -44,9 +44,10 @@ dnl ##############################
 dnl # Do automated configuration #
 dnl ##############################
 
-dnl Set up conditionals for (target) host type:
-dnl ===========================================
+dnl Set up conditionals for (target) architecture:
+dnl ==============================================
 
+dnl Determine CPU
 case "x${target_cpu}" in
   xi?86)     HAVE_CPU_I386=yes ;
              AC_DEFINE(HAVE_CPU_I386) ;;
@@ -54,6 +55,8 @@ case "x${target_cpu}" in
              AC_DEFINE(HAVE_CPU_PPC) ;;
 esac
 
+dnl Determine endianness
+AC_C_BIGENDIAN
 
 dnl Check for tools:
 dnl ================
@@ -231,6 +234,11 @@ else
   HAVE_CSSAUTH="no"
 fi
 
+dnl check for libvorbis
+AC_MSG_CHECKING(Vorbis library)
+AC_MSG_RESULT(... check not implemented !! FIXME)
+HAVE_VORBIS="no"
+
 dnl check for gtkdoc
 AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)
 
@@ -353,6 +361,7 @@ AM_CONDITIONAL(HAVE_LIBMMX,         test "x$USE_LIBMMX" = "xyes")
 AM_CONDITIONAL(HAVE_ATOMIC_H,       test "x$USE_ATOMIC_H" = "xyes")
 AM_CONDITIONAL(HAVE_XAUDIO,         test "x$HAVE_XAUDIO" = "xyes")
 AM_CONDITIONAL(HAVE_CSSAUTH,        test "x$HAVE_CSSAUTH" = "xyes")
+AM_CONDITIONAL(HAVE_VORBIS,         test "x$HAVE_VORBIS" = "xyes")
 AM_CONDITIONAL(HAVE_NASM,           test "x$HAVE_NASM" = "xyes")
 AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBXV,          test "x$HAVE_LIBXV" = "xyes")
diff --git a/libs/Makefile.am b/libs/Makefile.am
index d02f8815fa..77fae5f1b8 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,3 +1,9 @@
-SUBDIRS = riff colorspace getbits putbits videoscale winloader idct
+if HAVE_CPU_I386
+GSTARCH_SUBDS = videoscale winloader idct
+else
+GSTARCH_SUBDS =
+endif
+
+SUBDIRS = riff colorspace getbits putbits $(GSTARCH_SUBDS)
 
 DIST_SUBDIRS = riff colorspace getbits putbits videoscale winloader idct