Index: /libmpc/branches/r2d/mpcenc/mpcenc.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 221)
+++ /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 222)
@@ -36,5 +36,4 @@
 int           APE_Version     = 2000;
 int           LowDelay        = 0;
-mpc_bool_t    EnableTags      = MPC_FALSE;
 mpc_bool_t    IsEndBeep       = MPC_FALSE;
 
@@ -222,5 +221,4 @@
              "                   abstract, bibliography, introplay, media, language, ...\n"
              "  --unicode        unicode input from console\n"
-             "  --writetags      enable tags                              (dflt: off)\n"
              "\n" );
 
@@ -1032,7 +1030,4 @@
         else if ( 0 == strcmp ( arg, "unicode") ) {                                  // no tag conversion
             NoUnicode = 0;
-        }
-        else if ( 0 == strcmp ( arg, "writetags") ) {
-            EnableTags = MPC_TRUE;
         }
         else if ( 0 == strcmp ( arg, "lowdelay") ) {
@@ -1743,6 +1738,5 @@
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.outputBits );
 
-    if(EnableTags)
-        FinalizeTags ( e.outputFile, APE_Version );
+    FinalizeTags ( e.outputFile, APE_Version );
     fclose ( e.outputFile );
     fclose ( Wave.fp );
Index: /libmpc/branches/r2d/mpcenc/tags.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/tags.c	(revision 221)
+++ /libmpc/branches/r2d/mpcenc/tags.c	(revision 222)
@@ -1323,5 +1323,5 @@
     CopyTags_APE  (fp);                 // APE tags have higher priority than ID3V1 tags
     CopyTags_ID3  (fp);
-    CopyTags_Name (filename);
+//     CopyTags_Name (filename);
 
     fclose (fp);