diff -Naupr easytag-1.99.12.orig/configure easytag-1.99.12/configure
--- easytag-1.99.12.orig/configure	2005-12-15 20:53:37.000000000 +0100
+++ easytag-1.99.12/configure	2006-07-11 18:47:40.000000000 +0200
@@ -24397,7 +24397,7 @@ echo "${ECHO_T}$LINGUAS" >&6
 
 
 
-                                                                                ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in"
+                                                                                ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile po/Makefile.in"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -24968,7 +24968,6 @@ do
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/id3lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;;
   "src/libapetag/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;;
-  "src/libmpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;;
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
diff -Naupr easytag-1.99.12.orig/configure.in easytag-1.99.12/configure.in
--- easytag-1.99.12.orig/configure.in	2005-12-15 20:50:49.000000000 +0100
+++ easytag-1.99.12/configure.in	2006-07-11 18:47:22.000000000 +0200
@@ -318,7 +318,6 @@ AC_OUTPUT([ Makefile
             src/Makefile
             src/id3lib/Makefile
             src/libapetag/Makefile
-            src/libmpg123/Makefile
             po/Makefile.in
          ])
 
diff -Naupr easytag-1.99.12.orig/src/Makefile.am easytag-1.99.12/src/Makefile.am
--- easytag-1.99.12.orig/src/Makefile.am	2005-11-28 00:57:02.000000000 +0100
+++ easytag-1.99.12/src/Makefile.am	2006-07-11 18:47:04.000000000 +0200
@@ -1,6 +1,6 @@
 CFLAGS = @CFLAGS@ @GTK_CFLAGS@
 
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 
 bin_PROGRAMS = easytag
 
@@ -70,7 +70,7 @@ EXTRA_DIST = \
  win32/win32dep.h \
  win32/win_easytag.c
 
-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
 
 localedir = $(datadir)/locale
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
diff -Naupr easytag-1.99.12.orig/src/Makefile.in easytag-1.99.12/src/Makefile.in
--- easytag-1.99.12.orig/src/Makefile.in	2005-12-15 20:53:34.000000000 +0100
+++ easytag-1.99.12/src/Makefile.in	2006-07-11 18:47:04.000000000 +0200
@@ -63,7 +63,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape
 	vcedit.$(OBJEXT)
 easytag_OBJECTS = $(am_easytag_OBJECTS)
 am__DEPENDENCIES_1 =
-easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \
+easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	libapetag/libapetag.a id3lib/libid3bugfix.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -211,7 +211,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 easytag_SOURCES = \
  about.c \
  about.h \
@@ -278,7 +278,7 @@ EXTRA_DIST = \
  win32/win32dep.h \
  win32/win_easytag.c
 
-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
 localedir = $(datadir)/locale
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
 INCLUDES = -DLOCALE=\"$(localedir)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
diff -Naupr easytag-1.99.12.orig/src/Makefile.mingw easytag-1.99.12/src/Makefile.mingw
--- easytag-1.99.12.orig/src/Makefile.mingw	2006-03-02 00:13:48.000000000 +0100
+++ easytag-1.99.12/src/Makefile.mingw	2006-07-11 18:47:04.000000000 +0200
@@ -79,13 +79,6 @@ DLL_C_SRC = about.c \
     libapetag/info_mac.c \
     libapetag/info_mpc.c \
     libapetag/is_tag.c \
-    libmpg123/common.c \
-    libmpg123/dxhead.c \
-    libmpg123/getbits.c \
-    libmpg123/layer1.c \
-    libmpg123/layer2.c \
-    libmpg123/layer3.c \
-    libmpg123/mpg123.c \
     misc.c \
     monkeyaudio_header.c \
     mp4_header.c \
diff -Naupr easytag-1.99.12.orig/src/mpeg_header.c easytag-1.99.12/src/mpeg_header.c
--- easytag-1.99.12.orig/src/mpeg_header.c	2005-10-19 23:30:50.000000000 +0200
+++ easytag-1.99.12/src/mpeg_header.c	2006-07-11 18:47:04.000000000 +0200
@@ -31,10 +31,9 @@
 #include "et_core.h"
 #include "misc.h"
 #include "charset.h"
-#include "libmpg123/mpg123.h"
 
-//#include <id3.h>
-//#include "id3lib/id3_bugfix.h"
+#include <id3.h>
+#include "id3lib/id3_bugfix.h"
 
 
 
@@ -82,7 +81,7 @@ static gchar* channel_mode_name(int mode
  */
 gboolean Mpeg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
 {
-#if (1)
+#if (0)
     FILE *file;
     gulong filesize;