diff --git a/tkined/unix/configure.in b/tkined/unix/configure.in
index 5218040..3f748df 100644
--- a/tkined/unix/configure.in
+++ b/tkined/unix/configure.in
@@ -7,8 +7,8 @@ dnl
 AC_INIT(scotty.c)
 AC_CONFIG_HEADER(config.h)
 
-TNM_VERSION=3.0.4
-TKI_VERSION=1.5.1
+TNM_VERSION=3.1.0
+TKI_VERSION=1.6.0
 TCL_VERSION=8.6
 TK_VERSION=8.6
 
diff --git a/tkined/win/makefile b/tkined/win/makefile
index fb12839..27ad392 100644
--- a/tkined/win/makefile
+++ b/tkined/win/makefile
@@ -5,16 +5,16 @@
 # and is derived from the example provided by Sun Microsystems.
 #
 
-TNM_VERSION = 3.0.4
-TNM_DLL_VERSION = 304
+TNM_VERSION = 3.1.0
+TNM_DLL_VERSION = 310
 
-TKI_VERSION = 1.5.1
-TKI_DLL_VERSION = 151
+TKI_VERSION = 1.6.0
+TKI_DLL_VERSION = 160
 
-TCL_DLL_VERSION = 84
-TK_DLL_VERSION = 84
+TCL_DLL_VERSION = 86
+TK_DLL_VERSION = 86
 
-TCL_SH_VERSION = 84
+TCL_SH_VERSION = 86
 
 #
 # Project directories -- these may need to be customized for your site
@@ -30,9 +30,9 @@ TCL_SH_VERSION = 84
 ROOT	= .\..
 TMPDIR	= .
 TOOLS32	= C:\Progra~1\Micros~4\VC98
-TCLSRC = D:\develop\src\tcl8.4.9
-TCL	= D:\develop\tcl8.4.9
-TCLP	= D:/develop/tcl8.4.9
+TCLSRC = D:\develop\src\tcl8.6.8
+TCL	= D:\develop\tcl8.6.8
+TCLP	= D:/develop/tcl8.6.8
 TNM	= $(TCL)\lib\tnm$(TNM_VERSION)
 TNMP	= $(TCLP)/lib/tnm$(TNM_VERSION)
 TKI	= $(TCL)\lib\tkined$(TKI_VERSION)
diff --git a/tnm/configure.ac b/tnm/configure.ac
index 1299b14..116bfdb 100644
--- a/tnm/configure.ac
+++ b/tnm/configure.ac
@@ -20,14 +20,14 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([Tnm], [3.0.4])
+AC_INIT([Tnm], [3.1.0])
 
 #-----------------------------------------------------------------------
 # Scotty specific definitions and checks
 #-----------------------------------------------------------------------
 
-TNM_VERSION=3.0.4
-TKI_VERSION=1.5.1
+TNM_VERSION=3.1.0
+TKI_VERSION=1.6.0
 
 # disabled config.h generation, since this inhibits stub compilation
 AC_CONFIG_HEADER([config.h])
diff --git a/tnm/generic/tnm.h b/tnm/generic/tnm.h
index 6c2b004..557bbae 100644
--- a/tnm/generic/tnm.h
+++ b/tnm/generic/tnm.h
@@ -78,9 +78,9 @@ typedef long LONG;
  *----------------------------------------------------------------
  */
 
-#define TNM_VERSION "3.0.4"
+#define TNM_VERSION "3.1.0"
 #ifndef TKI_VERSION
-#define TKI_VERSION "1.5.1"
+#define TKI_VERSION "1.6.0"
 #endif
 
 #ifndef TNM_URL
diff --git a/tnm/library/TnmDialog.tcl b/tnm/library/TnmDialog.tcl
index d0daafe..9cdd0bf 100644
--- a/tnm/library/TnmDialog.tcl
+++ b/tnm/library/TnmDialog.tcl
@@ -12,8 +12,8 @@
 #
 # @(#) $Id: TnmDialog.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package provide TnmDialog 3.0.4
+package require Tnm 3.1
+package provide TnmDialog 3.1.0
 
 namespace eval TnmDialog {
     namespace export Confirm
diff --git a/tnm/library/TnmEther.tcl b/tnm/library/TnmEther.tcl
index 1ccaa71..72fe6da 100644
--- a/tnm/library/TnmEther.tcl
+++ b/tnm/library/TnmEther.tcl
@@ -15,8 +15,8 @@
 #
 # @(#) $Id: TnmEther.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package provide TnmEther 3.0.4
+package require Tnm 3.1
+package provide TnmEther 3.1.0
 
 namespace eval TnmEther {
     namespace export GetVendor GetEthers
diff --git a/tnm/library/TnmIetf.tcl b/tnm/library/TnmIetf.tcl
index 366246e..f4e4a25 100644
--- a/tnm/library/TnmIetf.tcl
+++ b/tnm/library/TnmIetf.tcl
@@ -13,8 +13,8 @@
 #
 # @(#) $Id: TnmIetf.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package provide TnmIetf 3.0.4
+package require Tnm 3.1
+package provide TnmIetf 3.1.0
 
 namespace eval TnmMap {
     namespace export GetRfcUrl GetMibModuleUrl
diff --git a/tnm/library/TnmInet.tcl b/tnm/library/TnmInet.tcl
index 8cabfcb..7616da6 100644
--- a/tnm/library/TnmInet.tcl
+++ b/tnm/library/TnmInet.tcl
@@ -10,8 +10,8 @@
 #
 # @(#) $Id: TnmInet.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package provide TnmInet 3.0.4
+package require Tnm 3.1
+package provide TnmInet 3.1.0
 
 namespace eval TnmInet {
     namespace export GetIpAddress GetIpName DayTime Finger TraceRoute
diff --git a/tnm/library/TnmMap.tcl b/tnm/library/TnmMap.tcl
index cad1186..7753c55 100644
--- a/tnm/library/TnmMap.tcl
+++ b/tnm/library/TnmMap.tcl
@@ -13,9 +13,9 @@
 #
 # @(#) $Id: TnmMap.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package require TnmInet 3.0
-package provide TnmMap 3.0.4
+package require Tnm 3.1
+package require TnmInet 3.1
+package provide TnmMap 3.1.0
 
 namespace eval TnmMap {
     namespace export GetIpAddress GetIpName GetSnmpSession
diff --git a/tnm/library/TnmMib.tcl b/tnm/library/TnmMib.tcl
index d63af74..139ea0b 100644
--- a/tnm/library/TnmMib.tcl
+++ b/tnm/library/TnmMib.tcl
@@ -10,8 +10,8 @@
 #
 # @(#) $Id: TnmMib.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package provide TnmMib 3.0.4
+package require Tnm 3.1
+package provide TnmMib 3.1.0
 
 namespace eval TnmMib {
     namespace export DescribeType DescribeNode GetVendor
diff --git a/tnm/library/TnmMonitor.tcl b/tnm/library/TnmMonitor.tcl
index 18c7b7a..bffdb8b 100644
--- a/tnm/library/TnmMonitor.tcl
+++ b/tnm/library/TnmMonitor.tcl
@@ -15,9 +15,9 @@
 #
 # @(#) $Id: TnmMonitor.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package require TnmMap 3.0
-package provide TnmMonitor 3.0.4
+package require Tnm 3.1
+package require TnmMap 3.1
+package provide TnmMonitor 3.1.0
 
 #########################################################################
 
diff --git a/tnm/library/TnmScriptMib.tcl b/tnm/library/TnmScriptMib.tcl
index cc12c2b..4156908 100644
--- a/tnm/library/TnmScriptMib.tcl
+++ b/tnm/library/TnmScriptMib.tcl
@@ -10,9 +10,9 @@
 #
 # @(#) $Id: TnmScriptMib.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package require TnmSnmp 3.0
-package provide TnmScriptMib 3.0.4
+package require Tnm 3.1
+package require TnmSnmp 3.1
+package provide TnmScriptMib 3.1.0
 
 namespace eval TnmScriptMib {
     namespace export GetLanguages GetExtensions
diff --git a/tnm/library/TnmSmxProfiles.tcl b/tnm/library/TnmSmxProfiles.tcl
index 5e7590d..c34c8b8 100644
--- a/tnm/library/TnmSmxProfiles.tcl
+++ b/tnm/library/TnmSmxProfiles.tcl
@@ -9,7 +9,7 @@
 
 package require Tnm 3.0
 
-package provide TnmSmxProfiles 3.0.4
+package provide TnmSmxProfiles 3.1.0
 
 namespace eval TnmSmxProfiles {
     namespace export safe tnm snmp snmp-134.169
diff --git a/tnm/library/TnmSnmp.tcl b/tnm/library/TnmSnmp.tcl
index 6559003..5a80f6a 100644
--- a/tnm/library/TnmSnmp.tcl
+++ b/tnm/library/TnmSnmp.tcl
@@ -11,10 +11,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require Tnm 3.0
-package require TnmDialog 3.0
-package require TnmInet 3.0
-package provide TnmSnmp 3.0.4
+package require Tnm 3.1
+package require TnmDialog 3.1
+package require TnmInet 3.1
+package provide TnmSnmp 3.1.0
 
 namespace eval TnmSnmp {
     namespace export Walk
diff --git a/tnm/library/TnmTerm.tcl b/tnm/library/TnmTerm.tcl
index 2cbc82b..e807fef 100644
--- a/tnm/library/TnmTerm.tcl
+++ b/tnm/library/TnmTerm.tcl
@@ -15,10 +15,10 @@
 #
 # @(#) $Id: TnmTerm.tcl,v 1.1.1.1 2006/12/07 12:16:57 karl Exp $
 
-package require Tnm 3.0
-package require TnmInet 3.0
-package require TnmDialog 3.0
-package provide TnmTerm 3.0.4
+package require Tnm 3.1
+package require TnmInet 3.1
+package require TnmDialog 3.1
+package provide TnmTerm 3.1.0
 
 namespace eval TnmTerm {
     namespace export Open Close Clear Write SetName SetIcon
diff --git a/tnm/library/pkgIndex.tcl b/tnm/library/pkgIndex.tcl
index e6c27fa..75e273e 100644
--- a/tnm/library/pkgIndex.tcl
+++ b/tnm/library/pkgIndex.tcl
@@ -7,6 +7,6 @@ foreach pkg {
     TnmDialog TnmTerm TnmInet TnmMap TnmIetf TnmEther TnmMonitor
     TnmSnmp TnmMib TnmScriptMib TnmSmxProfiles
 } {
-    package ifneeded $pkg 3.0.4 [list source [file join $dir $pkg.tcl]]
+    package ifneeded $pkg 3.1.0 [list source [file join $dir $pkg.tcl]]
 }
 
diff --git a/tnm/tests/l.smx.test b/tnm/tests/l.smx.test
index 1197be3..bea098d 100644
--- a/tnm/tests/l.smx.test
+++ b/tnm/tests/l.smx.test
@@ -63,7 +63,7 @@ proc startengine {} {
 	package require TnmSmxProfiles 3.0
 	namespace import TnmSmxProfiles::*
     } $file
-    exec scotty3.0.4 $file &
+    exec scotty3.1.0 $file &
     vwait smx(channel)
 }
 
diff --git a/tnm/tests/netdb.test b/tnm/tests/netdb.test
index defb3de..798568d 100644
--- a/tnm/tests/netdb.test
+++ b/tnm/tests/netdb.test
@@ -26,9 +26,9 @@ testConstraint knownBug64BitArchitecture [expr {!(
 			       || ($::tcl_platform(machine) == "x86_64")
 			       )}]
 
-testConstraint pre3.0.4 [expr {[package vcompare $::tnm(version) 3.0.4] == -1}]
+testConstraint pre3.1.0 [expr {[package vcompare $::tnm(version) 3.1.0] == -1}]
 
-package require Tnm 3.0
+package require Tnm 3.1
 catch {
     namespace import Tnm::netdb
 }
diff --git a/tnm/unix/configure.in b/tnm/unix/configure.in
index 5218040..3f748df 100644
--- a/tnm/unix/configure.in
+++ b/tnm/unix/configure.in
@@ -7,8 +7,8 @@ dnl
 AC_INIT(scotty.c)
 AC_CONFIG_HEADER(config.h)
 
-TNM_VERSION=3.0.4
-TKI_VERSION=1.5.1
+TNM_VERSION=3.1.0
+TKI_VERSION=1.6.0
 TCL_VERSION=8.6
 TK_VERSION=8.6
 
diff --git a/tnm/win/makefile b/tnm/win/makefile
index b6fd4f0..426dc4e 100644
--- a/tnm/win/makefile
+++ b/tnm/win/makefile
@@ -5,10 +5,10 @@
 # and is derived from the example provided by Sun Microsystems.
 #
 
-TNM_VERSION = 3.0.4
+TNM_VERSION = 3.1.0
 TNM_DLL_VERSION = 304
 
-TKI_VERSION = 1.5.0
+TKI_VERSION = 1.6.0
 TKI_DLL_VERSION = 150
 
 TCL_DLL_VERSION = 84
diff --git a/tnm/win/tnmWinPort.h b/tnm/win/tnmWinPort.h
index 31a0221..a4863f0 100644
--- a/tnm/win/tnmWinPort.h
+++ b/tnm/win/tnmWinPort.h
@@ -39,11 +39,11 @@
 #define TKI_VERSION "1.5.1"
 
 #ifndef TNMLIB
-#define TNMLIB "c:/tcl/lib/tnm3.0.4"
+#define TNMLIB "c:/tcl/lib/tnm3.1.0"
 #endif
 
 #ifndef TKINEDLIB
-#define TKINEDLIB "c:/tcl/lib/tkined1.5.0"
+#define TKINEDLIB "c:/tcl/lib/tkined1.6.0"
 #endif
 
 /*