--- a/Makefile	Fri Jun 13 19:15:26 2014 -0700
+++ b/Makefile	Sat Jun 14 08:54:34 2014 -0700
@@ -6,7 +6,11 @@
 apk='bin/510Connectbot-$(style).apk'
 
 all:
-	hg pull; hg update; rm -rf gen bin
+	hg pull; hg update
+	make builder
+
+builder:
+    rm -rf gen bin
 	ndk-build clean; V=1 ndk-build
 	android update project -p . -t android-16
 	ant $(style)

--- a/assets/help/About.html	Fri Jun 13 19:15:26 2014 -0700
+++ b/assets/help/About.html	Sat Jun 14 08:54:34 2014 -0700
@@ -8,7 +8,7 @@
 &lt;carl@five-ten-sg.com&gt;</p>
 
 <p>This is an enhanced version of the popular open-source telnet and
-secure shell (SSH) client ConnectBot.</p>
+secure shell (SSH) client ConnectBot. It now includes tn5250 emulation.</p>
 
 <p>It is licensed under
 the <a href="http://www.gnu.org/licenses/gpl-3.0.txt">GPLv3 or later
@@ -50,6 +50,12 @@
 </p>
 
 <p>
+Based on TN5250J terminal emulator provided under the GPLv2
+license. Copyright &copy; 2001 Kenneth J. Pouncey.
+<a href="http://tn5250j.sourceforge.net"></a>http://tn5250j.sourceforge.net
+</p>
+
+<p>
 Includes the JSOCKS library, provided under the GNU LGPL
 license. <a href="http://jsocks.sourceforge.net">http://jsocks.sourceforge.net</a>
 </p>

--- a/src/com/five_ten_sg/connectbot/service/TerminalManager.java	Fri Jun 13 19:15:26 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalManager.java	Sat Jun 14 08:54:34 2014 -0700
@@ -252,7 +252,7 @@
     }
 
     public String getEmulation() {
-        return prefs.getString(PreferenceConstants.EMULATION, "screen");
+        return prefs.getString(PreferenceConstants.EMULATION, "xterm-256color");
     }
 
     public int getScrollback() {

--- a/xml/510connectbot.in	Fri Jun 13 19:15:26 2014 -0700
+++ b/xml/510connectbot.in	Sat Jun 14 08:54:34 2014 -0700
@@ -24,7 +24,7 @@
 
     <refentry id="x@PACKAGE@.1">
         <refentryinfo>
-            <date>2014-05-13</date>
+            <date>2014-06-14</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -40,7 +40,7 @@
 
         <refnamediv id='name.1'>
             <refname>@PACKAGE@</refname>
-            <refpurpose>an android vt320 terminal emulator for telnet/ssh connections</refpurpose>
+            <refpurpose>an android vt320/tn5250 terminal emulator for telnet/ssh connections</refpurpose>
         </refnamediv>
 
         <refsect1 id='build.1'>
@@ -61,14 +61,17 @@
                 compatible with the licenses of all the sub-parts.
             </para>
             <para>
-                The intention is to add 5250 emulation to this project.
+                This fork extends previous connectbot projects in two ways. It includes
+                tn5250 terminal emulation, in addition to the previous vt320 terminal
+                emulation. It also contains hooks for a separate monitoring process
+                that has access to some of the internal operations in this emulator.
             </para>
         </refsect1>
 
         <refsect1 id='monitor.1'>
             <title>Terminal Monitor</title>
             <para>
-                For every terminal session (local, telnet, ssh or other), this
+                For every terminal session (local, telnet, ssh or tn5250), this
                 terminal emulator also makes a connection to a terminal monitor
                 process, which can see keystrokes and screen contents, and can
                 inject characters to send to the host.
@@ -179,7 +182,8 @@
         <refsect1 id='todo.1'>
             <title>TODO</title>
             <para>
-                Add 5250 emulation.
+                The tn5250 ssl/tls key storage should use the same storage mechanism
+                as the base ssh key storage.
             </para>
         </refsect1>
 
@@ -230,6 +234,11 @@
                 Marcus Meiner. http://www.javassh.org
             </para>
             <para>
+                Based on TN5250J terminal emulator provided under the GPLv2
+                license. Copyright (C) 2001 Kenneth J. Pouncey.
+                http://tn5250j.sourceforge.net/
+            </para>
+            <para>
                 Includes the JSOCKS library, provided
                 under the GNU LGPL license. http://jsocks.sourceforge.net
             </para>
@@ -247,6 +256,12 @@
                 https://github.com/staktrace/connectbot/commits/filetransfer
                 modifications by Kartikaya Gupta.
             </para>
+            <para>
+                Internal file selection dialog is based on Android File
+                Dialog by Alexander Ponomarev, provided under a BSD-style
+                license.
+                http://code.google.com/p/android-file-dialog
+            </para>
         </refsect1>
 
         <refsect1 id='version.1'>