diff --git a/Makefile.am b/Makefile.am
index 1443044..3519962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,9 +65,9 @@ libstb_hal_la_LIBADD += \
 	libarmbox/libarmbox.la \
 	libdvbci/libdvbci.la
 if !ENABLE_GSTREAMER_10
-SUBDIRS += libeplayer3-arm
+SUBDIRS += libeplayer3
 libstb_hal_la_LIBADD += \
-	libeplayer3-arm/libeplayer3_arm.la
+	libeplayer3/libeplayer3.la
 endif
 endif
 endif
@@ -77,7 +77,7 @@ SUBDIRS += libmipsbox libdvbci
 libstb_hal_la_LIBADD += \
 	libmipsbox/libmipsbox.la \
 	libdvbci/libdvbci.la
-SUBDIRS += libeplayer3-mips
+SUBDIRS += libeplayer3
 libstb_hal_la_LIBADD += \
-	libeplayer3-mips/libeplayer3_mips.la
+	libeplayer3/libeplayer3.la
 endif
diff --git a/configure.ac b/configure.ac
index e5ab8c3..61aa18a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,12 +95,12 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then
 fi
 
 AC_ARG_ENABLE(flv2mpeg4,
-	AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3-arm),
+	AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3),
 	,[enable_flv2mpeg4=no])
 
 AM_CONDITIONAL(ENABLE_FLV2MPEG4, test "$enable_flv2mpeg4" = "yes")
 if test "$enable_flv2mpeg4" = "yes"; then
-	AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm])
+	AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3])
 fi
 
 AC_CONFIG_FILES([
@@ -111,8 +111,7 @@ libarmbox/Makefile
 libazbox/Makefile
 libduckbox/Makefile
 libdvbci/Makefile
-libeplayer3-mips/Makefile
-libeplayer3-arm/Makefile
+libeplayer3/Makefile
 libeplayer3-sh4/Makefile
 libgeneric-pc/Makefile
 libraspi/Makefile
diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am
index b29e212..04e808c 100644
--- a/libeplayer3/Makefile.am
+++ b/libeplayer3/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR
 
 CXXFLAGS = -Wall
 
-noinst_LTLIBRARIES = libeplayer3_arm.la
+noinst_LTLIBRARIES = libeplayer3.la
 
 AM_CPPFLAGS   = -I$(srcdir)/include
 AM_CPPFLAGS  += -I$(top_srcdir)/include
@@ -59,11 +59,11 @@ SOURCE_FILES += \
 	output/writer/mipsel/wmv.c \
 	output/writer/mipsel/vc1.c
 
-libeplayer3_arm_la_SOURCES = $(SOURCE_FILES)
+libeplayer3_la_SOURCES = $(SOURCE_FILES)
 
-LIBEPLAYER3_LIBS = libeplayer3_arm.la -lpthread -lavformat -lavcodec -lavutil -lswresample
+LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample
 
 bin_PROGRAMS = eplayer3
 eplayer3_SOURCES = main/exteplayer.c
 eplayer3_LDADD = $(LIBEPLAYER3_LIBS)
-eplayer3_DEPENDENCIES = libeplayer3_arm.la
+eplayer3_DEPENDENCIES = libeplayer3.la