--- cmddata.cpp.orig	2014-06-11 01:14:06.000000000 +0800
+++ cmddata.cpp	2014-07-31 22:54:35.727051754 +0800
@@ -173,6 +173,34 @@
   // Suppress the copyright message and final end of line for 'lb' and 'vb'.
   if ((CmdChar=='L' || CmdChar=='V') && Command[1]=='B')
     BareOutput=true;
+#ifdef WITH_ICONV
+  if ( (encInt[0] != '\0') || (encExt[0] != '\0') ) {
+    char fullEncInt[ENC_MAXLEN + OPT_MAXLEN + 1];
+    char fullEncExt[ENC_MAXLEN + OPT_MAXLEN + 1];
+
+    strcpy(fullEncInt, encInt);
+    strcpy(fullEncExt, encExt);
+
+    if (encOpt[0] == '\0') strcpy(encOpt, OPT_DEFAULT);
+
+    if (encOpt[0] != '\0') {
+      strcat(fullEncInt, "//"); strcat(fullEncInt, encOpt);
+      strcat(fullEncExt, "//"); strcat(fullEncExt, encOpt);
+    }
+
+    h_E2I = iconv_open(fullEncInt, encExt);
+    h_I2E = iconv_open(fullEncExt, encInt);
+
+    if ( (h_E2I == (iconv_t)(-1)) || (h_I2E == (iconv_t)(-1)) ) {
+      if (h_E2I != (iconv_t)(-1)) iconv_close(h_E2I);
+      if (h_I2E != (iconv_t)(-1)) iconv_close(h_I2E);
+      mprintf(St(MIconvCannotOpen), encInt, encExt, encOpt);
+    }
+  } else {
+    h_E2I = (iconv_t)(-1);
+    h_I2E = (iconv_t)(-1);
+  }
+#endif
 }
 
 
@@ -881,6 +909,22 @@
       else
         wcsncpyz(CommentFile,Switch+1,ASIZE(CommentFile));
       break;
+#ifdef WITH_ICONV
+    case 'L':
+      switch(toupperw(Switch[1]))
+      {
+	case 'L':
+	  strncpyz(encExt, (const char *)Switch+2, ASIZE(encExt));
+	  break;
+        case 'A':
+	  strncpyz(encInt, (const char *)Switch+2, ASIZE(encInt));
+	  break;
+	case 'O':
+	  strncpyz(encOpt, (const char *)Switch+2, ASIZE(encOpt));
+	  break;
+      }
+      break;
+#endif
 #ifndef GUI
     case '?' :
       OutHelp(RARX_SUCCESS);
@@ -959,7 +1003,11 @@
     MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP,
     MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,
     MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR,
-    MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,
+    MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,
+#ifdef WITH_ICONV
+    MCHelpSwLA,MCHelpSwLL,MCHelpSwLO,
+#endif
+    MCHelpSwN,MCHelpSwNa,MCHelpSwNal,
     MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP,
     MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM,
     MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,
--- global.hpp.orig	2014-06-11 01:14:06.000000000 +0800
+++ global.hpp	2014-07-31 22:56:02.117045684 +0800
@@ -9,6 +9,17 @@
 
 EXTVAR ErrorHandler ErrHandler;
 
+#ifdef WITH_ICONV
+#define OPT_DEFAULT "IGNORE"	/* ignore unrepresentable chars */
 
+#define ENC_MAXLEN 32		/* encoding name maximum length */
+#define OPT_MAXLEN 9		/* strlen("TRANSLIT") */
+
+EXTVAR iconv_t h_E2I;			/* ExtToInt handler */
+EXTVAR iconv_t h_I2E;			/* IntToExt handler */
+EXTVAR char encInt[ENC_MAXLEN];	/* internal (archive) encoding */
+EXTVAR char encExt[ENC_MAXLEN];	/* external (filesystem) encoding */
+EXTVAR char encOpt[OPT_MAXLEN];	/* encoding option (ignore/translit) */
+#endif
 
 #endif
--- loclang.hpp.orig	2014-06-11 01:14:06.000000000 +0800
+++ loclang.hpp	2014-07-31 22:57:33.346038437 +0800
@@ -7,7 +7,7 @@
 #define   MCopyright         L"\nRAR %s   Copyright (c) 1993-%d Alexander Roshal   %d %s %d"
 #define   MRegTo             L"\nRegistered to %s\n"
 #define   MShare             L"\nTrial version             Type RAR -? for help\n"
-#define   MUCopyright        L"\nUNRAR %s freeware      Copyright (c) 1993-%d Alexander Roshal\n"
+#define   MUCopyright        L"\nUNRAR %s (iconv) freeware      Copyright (c) 1993-%d Alexander Roshal\n"
 #define   MBeta              L"beta"
 #define   MMonthJan          L"Jan"
 #define   MMonthFeb          L"Feb"
@@ -328,7 +328,7 @@
 #define   MSyncScanError     L"\nFile search errors, cannot synchronize archive"
 #define   MCorrectingName    L"\nWARNING: Attempting to correct the invalid file name"
 #define   MUnpCannotMerge    L"\nWARNING: You need to start extraction from a previous volume to unpack %s"
-#define   MUnknownOption     L"\nERROR: Unknown option: %s"
+#define   MUnknownOption     L"\nERROR: Unknown option: %s\n"
 #define   MSubHeadCorrupt    L"\nERROR: Corrupt data header found, ignored"
 #define   MSubHeadUnknown    L"\nWARNING: Unknown data header format, ignored"
 #define   MSubHeadDataCRC    L"\nERROR: Corrupt %s data block"
@@ -355,6 +355,12 @@
 #define   MSHelpCmdV         L"\n  -v      Verbosely list contents of archive" 
 #define   MRecVolLimit       L"\nTotal number of usual and recovery volumes must not exceed %d"
 #define   MVolumeNumber      L"volume %d"
+#ifdef WITH_ICONV
+#define   MCHelpSwLA         L"\n  la<encoding>  Archive internal filenames encoding"
+#define   MCHelpSwLL         L"\n  ll<encoding>  Your locale encoding"
+#define   MCHelpSwLO         L"\n  lo<option>    Encoding option {ignore,translit,<empty>}"
+#define   MIconvCannotOpen   L"\nCannot open iconv to convert between '%s' and '%s' with option '%s'"
+#endif
 #define   MCannotDelete      L"\nCannot delete %s"
 #define   MCalcCRC           L"\nCalculating the checksum"
 #define   MTooLargeSFXArc    L"\nWARNING: Too large SFX archive. Windows cannot run the executable file exceeding 4 GB."
--- os.hpp.orig	2014-06-11 01:14:06.000000000 +0800
+++ os.hpp	2014-07-31 22:58:30.619035684 +0800
@@ -154,6 +154,10 @@
 #include <utime.h>
 #include <locale.h>
 
+#ifdef WITH_ICONV
+#include <iconv.h>
+#endif
+
 #ifdef  S_IFLNK
 #define SAVE_LINKS
 #endif
--- strfn.cpp.orig	2014-06-11 01:14:06.000000000 +0800
+++ strfn.cpp	2014-07-31 22:59:29.039036713 +0800
@@ -14,6 +14,19 @@
 
 void IntToExt(const char *Src,char *Dest,size_t DestSize)
 {
+#ifdef WITH_ICONV
+  static size_t ret;
+  ret = (size_t)(-1);
+  if (h_I2E != (iconv_t)(-1)) {
+    static size_t inbytesleft, outbytesleft;
+    inbytesleft = strlen(Src)+1;
+    outbytesleft = NM;
+    ret = iconv(h_I2E, (char **)&Src, &inbytesleft, &Dest, &outbytesleft);
+    Dest[outbytesleft-inbytesleft]=0;
+  }
+  if (ret == (size_t)(-1))
+    strncpyz(Dest,Src,DestSize);
+#else  /* !WITH_ICONV */
 #ifdef _WIN_ALL
   OemToCharBuffA(Src,Dest,(DWORD)DestSize);
   Dest[DestSize-1]=0;
@@ -25,6 +38,7 @@
   if (Dest!=Src)
     strncpyz(Dest,Src,DestSize);
 #endif
+#endif /* !WITH_ICONV */
 }