diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 9840414e44e..dc948943b49 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -299,22 +299,6 @@
 		host on another network. </para></listitem>
 		</varlistentry>
 		
-		<varlistentry>
-		<term>-t terminal code</term>
-		<listitem><para>This option tells <command>smbclient</command> how to interpret 
-		filenames coming from the remote server. Usually Asian language 
-		multibyte UNIX implementations use different character sets than 
-		SMB/CIFS servers (<emphasis>EUC</emphasis> instead of <emphasis>
-		SJIS</emphasis> for example). Setting this parameter will let 
-		<command>smbclient</command> convert between the UNIX filenames and 
-		the SMB filenames correctly. This option has not been seriously tested 
-		and may have some problems. </para>
-
-		<para>The terminal codes include CWsjis, CWeuc, CWjis7, CWjis8,
-		CWjunet, CWhex, CWcap. This is not a complete list, check the Samba 
-		source code for the complete list. </para></listitem>
-		</varlistentry>
-			
 		<varlistentry>	
 		<term>-b buffersize</term>
 		<listitem><para>This option changes the transmit/send buffer 
diff --git a/source3/client/client.c b/source3/client/client.c
index 08526527257..36a70d012fe 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4738,7 +4738,6 @@ static int do_message_op(struct user_auth_info *a_info)
 	int opt;
 	char *query_host = NULL;
 	bool message = false;
-	char *term_code = NULL;
 	static const char *new_name_resolve_order = NULL;
 	poptContext pc;
 	char *p;
@@ -4754,7 +4753,6 @@ static int do_message_op(struct user_auth_info *a_info)
 		{ "ip-address", 'I', POPT_ARG_STRING, NULL, 'I', "Use this IP to connect to", "IP" },
 		{ "stderr", 'E', POPT_ARG_NONE, NULL, 'E', "Write messages to stderr instead of stdout" },
 		{ "list", 'L', POPT_ARG_STRING, NULL, 'L', "Get a list of shares available on a host", "HOST" },
-		{ "terminal", 't', POPT_ARG_STRING, NULL, 't', "Terminal I/O code {sjis|euc|jis7|jis8|junet|hex}", "CODE" },
 		{ "max-protocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set the max protocol level", "LEVEL" },
 		{ "tar", 'T', POPT_ARG_STRING, NULL, 'T', "Command line tar", "<c|x>IXFqgbNan" },
 		{ "directory", 'D', POPT_ARG_STRING, NULL, 'D', "Start from directory", "DIR" },
@@ -4774,15 +4772,6 @@ static int do_message_op(struct user_auth_info *a_info)
 		exit(ENOMEM);
 	}
 
-#ifdef KANJI
-	term_code = talloc_strdup(frame,KANJI);
-#else /* KANJI */
-	term_code = talloc_strdup(frame,"");
-#endif /* KANJI */
-	if (!term_code) {
-		exit(ENOMEM);
-	}
-
 	/* initialize the workgroup name so we can determine whether or
 	   not it was set by a command line option */
 
@@ -4876,12 +4865,6 @@ static int do_message_op(struct user_auth_info *a_info)
 				exit(ENOMEM);
 			}
 			break;
-		case 't':
-			term_code = talloc_strdup(frame,poptGetOptArg(pc));
-			if (!term_code) {
-				exit(ENOMEM);
-			}
-			break;
 		case 'm':
 			max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol);
 			break;
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 519eb6954a7..55c9cc16cf7 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -296,7 +296,6 @@ rameter is ignored when using CUPS libraries.\n",
 	static int show_all_parameters = False;
 	int ret = 0;
 	poptContext pc;
-	static const char *term_code = "";
 	static char *parameter_name = NULL;
 	static const char *section_name = NULL;
 	static char *new_local_machine = NULL;
@@ -310,7 +309,6 @@ rameter is ignored when using CUPS libraries.\n",
 		{"suppress-prompt", 's', POPT_ARG_VAL, &silent_mode, 1, "Suppress prompt for enter"},
 		{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
 		{"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
-		{"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
 		{"skip-logic-checks", 'l', POPT_ARG_NONE, &skip_logic_checks, 1, "Skip the global checks"},
 		{"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
 		{"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },