diff --git a/README b/README
index 10ff6eab..f15c1e5d 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ VERSION: 2.6.0
 
 AUTHORS:
     
-    Monte Ohrt <monte@ispi.net>
+    Monte Ohrt <monte@ohrt.com>
     Andrei Zmievski <andrei@php.net>
 
 MAILING LISTS:
@@ -75,6 +75,6 @@ DESCRIPTION:
     * and many more.
 
 COPYRIGHT:
-    Copyright (c) 2001,2002 ispi of Lincoln, Inc. All rights reserved.
+    Copyright (c) 2001-2005 New Digital Group, Inc. All rights reserved.
     This software is released under the GNU Lesser General Public License.
     Please read the disclaimer at the top of the Smarty.class.php file.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d5e95f5a..d1514db2 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -328,7 +328,7 @@ your copy of Smarty.)
 Documentation is written in docbook format. I updated the docbook -> HTML
 generating software & style-sheets, and consequently the examples are no longer
 in a different background color. If anyone wants to contribute a better
-stylesheet or help with documentation, drop me a line. <monte@ispi.net>
+stylesheet or help with documentation, drop me a line. <monte@ohrt.com>
 
 CHANGES/ENHANCEMENTS/UPDATES
 
diff --git a/docs/de/bookinfo.xml b/docs/de/bookinfo.xml
index 360dd66f..4e148bc1 100755
--- a/docs/de/bookinfo.xml
+++ b/docs/de/bookinfo.xml
@@ -5,7 +5,7 @@
   <title>Smarty - die kompilierende PHP Template-Engine</title>
   <authorgroup id="authors">
    <author>
-    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname><surname>Zmievski &lt;andrei@php.net&gt;</surname>
@@ -22,7 +22,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2004</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 <!-- Keep this comment at the end of the file
diff --git a/docs/en/bookinfo.xml b/docs/en/bookinfo.xml
index 13edeae2..2a3ae0c4 100755
--- a/docs/en/bookinfo.xml
+++ b/docs/en/bookinfo.xml
@@ -5,7 +5,7 @@
   <authorgroup id="authors">
    <author>
     <firstname>Monte</firstname>
-    <surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname>
@@ -15,7 +15,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2005</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 
diff --git a/docs/es/bookinfo.xml b/docs/es/bookinfo.xml
index e2f7d80b..ca40e97c 100755
--- a/docs/es/bookinfo.xml
+++ b/docs/es/bookinfo.xml
@@ -4,7 +4,7 @@
   <title>Smarty - El motor compilador de Plantillas para PHP</title>
   <authorgroup id="authors">
    <author>
-    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname><surname>Zmievski &lt;andrei@php.net&gt;</surname>
@@ -17,7 +17,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2004</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 
diff --git a/docs/fr/bookinfo.xml b/docs/fr/bookinfo.xml
index 7e9d9291..5c6c15d5 100755
--- a/docs/fr/bookinfo.xml
+++ b/docs/fr/bookinfo.xml
@@ -6,7 +6,7 @@
  <authorgroup id="authors">
   <author>
    <firstname>Monte</firstname>
-   <surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+   <surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
   </author>
   <author>
    <firstname>Andrei</firstname>
@@ -34,7 +34,7 @@
  <pubdate>&build-date;</pubdate>
  <copyright>
   <year>2001-2005</year>
-  <holder>ispi of Lincoln, Inc.</holder>
+  <holder>New Digital Group, Inc.</holder>
  </copyright>
 </bookinfo>
 
diff --git a/docs/it/bookinfo.xml b/docs/it/bookinfo.xml
index 104f1ef2..52aba8b5 100644
--- a/docs/it/bookinfo.xml
+++ b/docs/it/bookinfo.xml
@@ -5,7 +5,7 @@
   <authorgroup id="authors">
    <author>
     <firstname>Monte</firstname>
-    <surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname>
@@ -15,7 +15,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2004</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 
diff --git a/docs/pt_BR/bookinfo.xml b/docs/pt_BR/bookinfo.xml
index 23c10794..7c01d8d7 100755
--- a/docs/pt_BR/bookinfo.xml
+++ b/docs/pt_BR/bookinfo.xml
@@ -5,7 +5,7 @@
   <title>Smarty - a ferramenta para compilar templates para PHP</title>
   <authorgroup id="authors">
    <author>
-    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <firstname>Monte</firstname><surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname><surname>Zmievski &lt;andrei@php.net&gt;</surname>
@@ -28,7 +28,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2004</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 
diff --git a/docs/ru/bookinfo.xml b/docs/ru/bookinfo.xml
index d45338e5..cf1de527 100755
--- a/docs/ru/bookinfo.xml
+++ b/docs/ru/bookinfo.xml
@@ -6,7 +6,7 @@
   <authorgroup id="authors">
    <author>
     <firstname>Monte</firstname>
-    <surname>Ohrt &lt;monte@ispi.net&gt;</surname>
+    <surname>Ohrt &lt;monte@ohrt.com&gt;</surname>
    </author>
    <author>
     <firstname>Andrei</firstname>
@@ -26,7 +26,7 @@
   <pubdate>&build-date;</pubdate>
   <copyright>
    <year>2001-2005</year>
-   <holder>ispi of Lincoln, Inc.</holder>
+   <holder>New Digital Group, Inc.</holder>
   </copyright>
  </bookinfo>
 
diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php
index e281bec8..0ca2e44d 100644
--- a/libs/Config_File.class.php
+++ b/libs/Config_File.class.php
@@ -19,7 +19,7 @@
  *
  * @link http://smarty.php.net/
  * @version 2.6.6-dev
- * @copyright Copyright: 2001-2005 ispi of Lincoln, Inc.
+ * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
  * @package Smarty
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index f18d9ace..75905a73 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -23,8 +23,8 @@
  * smarty-general-subscribe@lists.php.net
  *
  * @link http://smarty.php.net/
- * @copyright 2001-2005 ispi of Lincoln, Inc.
- * @author Monte Ohrt <monte@ispi.net>
+ * @copyright 2001-2005 New Digital Group, Inc.
+ * @author Monte Ohrt <monte@ohrt.com>
  * @author Andrei Zmievski <andrei@php.net>
  * @package Smarty
  * @version 2.6.6-dev
diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php
index b100ee21..225500d8 100644
--- a/libs/Smarty_Compiler.class.php
+++ b/libs/Smarty_Compiler.class.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @author Monte Ohrt <monte@ispi.net>
+ * @author Monte Ohrt <monte@ohrt.com>
  * @author Andrei Zmievski <andrei@php.net>
  * @version 2.6.6-dev
- * @copyright 2001-2005 ispi of Lincoln, Inc.
+ * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
diff --git a/libs/plugins/function.cycle.php b/libs/plugins/function.cycle.php
index f61ff0b1..46fbab27 100644
--- a/libs/plugins/function.cycle.php
+++ b/libs/plugins/function.cycle.php
@@ -32,7 +32,7 @@
  * </pre>
  * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
  *       (Smarty online manual)
- * @author Monte Ohrt <monte@ispi.net>
+ * @author Monte Ohrt <monte@ohrt.com>
  * @author credit to Mark Priatel <mpriatel@rogers.com>
  * @author credit to Gerard <gerard@interfold.com>
  * @author credit to Jason Sweat <jsweat_php@yahoo.com>
diff --git a/libs/plugins/function.debug.php b/libs/plugins/function.debug.php
index 77e71092..ad315269 100644
--- a/libs/plugins/function.debug.php
+++ b/libs/plugins/function.debug.php
@@ -15,7 +15,7 @@
  * Purpose:  popup debug window
  * @link http://smarty.php.net/manual/en/language.function.debug.php {debug}
  *       (Smarty online manual)
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @version  1.0
  * @param array
  * @param Smarty
diff --git a/libs/plugins/function.html_checkboxes.php b/libs/plugins/function.html_checkboxes.php
index 7fda3981..617ddb28 100644
--- a/libs/plugins/function.html_checkboxes.php
+++ b/libs/plugins/function.html_checkboxes.php
@@ -31,7 +31,7 @@
  * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
  *      (Smarty online manual)
  * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte@ispi.net>
+ * @author credits to Monte Ohrt <monte@ohrt.com>
  * @version    1.0
  * @param array
  * @param Smarty
diff --git a/libs/plugins/function.html_image.php b/libs/plugins/function.html_image.php
index aa2aa187..5ccd388a 100644
--- a/libs/plugins/function.html_image.php
+++ b/libs/plugins/function.html_image.php
@@ -25,7 +25,7 @@
  * Output:   <img src="images/masthead.gif" border=0 width=400 height=23>
  * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
  *      (Smarty online manual)
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @author credits to Duda <duda@big.hu> - wrote first image function
  *           in repository, helped with lots of functionality
  * @version  1.0
diff --git a/libs/plugins/function.html_radios.php b/libs/plugins/function.html_radios.php
index d302cdb1..278185f9 100644
--- a/libs/plugins/function.html_radios.php
+++ b/libs/plugins/function.html_radios.php
@@ -31,7 +31,7 @@
  * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
  *      (Smarty online manual)
  * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte@ispi.net>
+ * @author credits to Monte Ohrt <monte@ohrt.com>
  * @version    1.0
  * @param array
  * @param Smarty
diff --git a/libs/plugins/function.html_table.php b/libs/plugins/function.html_table.php
index 0f6d03b9..75f6e192 100644
--- a/libs/plugins/function.html_table.php
+++ b/libs/plugins/function.html_table.php
@@ -33,7 +33,7 @@
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
  * {table loop=$data cols=4 tr_attr=$colors}
  * </pre>
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @version  1.0
  * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
  *          (Smarty online manual)
diff --git a/libs/plugins/function.mailto.php b/libs/plugins/function.mailto.php
index a4f4d2d5..7fb43117 100644
--- a/libs/plugins/function.mailto.php
+++ b/libs/plugins/function.mailto.php
@@ -40,7 +40,7 @@
  * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
  *          (Smarty online manual)
  * @version  1.2
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
  * @param    array
  * @param    Smarty
diff --git a/libs/plugins/modifier.cat.php b/libs/plugins/modifier.cat.php
index f5dc3d68..3a0ab989 100644
--- a/libs/plugins/modifier.cat.php
+++ b/libs/plugins/modifier.cat.php
@@ -17,7 +17,7 @@
  * Example:  {$var|cat:"foo"}
  * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
  *          (Smarty online manual)
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @version 1.0
  * @param string
  * @param string
diff --git a/libs/plugins/modifier.nl2br.php b/libs/plugins/modifier.nl2br.php
index 86a28d20..c6f9c245 100644
--- a/libs/plugins/modifier.nl2br.php
+++ b/libs/plugins/modifier.nl2br.php
@@ -21,7 +21,7 @@
  * @link http://smarty.php.net/manual/en/language.modifier.nl2br.php
  *          nl2br (Smarty online manual)
  * @version  1.0
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @param string
  * @return string
  */
diff --git a/libs/plugins/modifier.strip.php b/libs/plugins/modifier.strip.php
index 738c6407..9e08aebb 100644
--- a/libs/plugins/modifier.strip.php
+++ b/libs/plugins/modifier.strip.php
@@ -17,7 +17,7 @@
  * Date:     September 25th, 2002
  * @link http://smarty.php.net/manual/en/language.modifier.strip.php
  *          strip (Smarty online manual)
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @version  1.0
  * @param string
  * @param string
diff --git a/libs/plugins/outputfilter.trimwhitespace.php b/libs/plugins/outputfilter.trimwhitespace.php
index 9979e858..710ea313 100644
--- a/libs/plugins/outputfilter.trimwhitespace.php
+++ b/libs/plugins/outputfilter.trimwhitespace.php
@@ -19,7 +19,7 @@
  * Install:  Drop into the plugin directory, call
  *           <code>$smarty->load_filter('output','trimwhitespace');</code>
  *           from application.
- * @author   Monte Ohrt <monte@ispi.net>
+ * @author   Monte Ohrt <monte@ohrt.com>
  * @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
  * @version  1.3
  * @param string