Index: generic/nsf.h
===================================================================
diff -u -rf01f68eae4db5c767f8d5ce3cd0e366fb298b73b -re48161ab167236344f7d23da3e855c31d1a1ebc7
--- generic/nsf.h	(.../nsf.h)	(revision f01f68eae4db5c767f8d5ce3cd0e366fb298b73b)
+++ generic/nsf.h	(.../nsf.h)	(revision e48161ab167236344f7d23da3e855c31d1a1ebc7)
@@ -67,13 +67,32 @@
 # define PRE86
 #endif
 
+#if TCL_MAJOR_VERSION==8 && TCL_MINOR_VERSION<7
+# define PRE87
+#endif
+
+#if TCL_MAJOR_VERSION==8
+# define PRE9
+#endif
+
 #if defined(PRE86)
 # define CONST86
 # define Tcl_GetErrorLine(interp) (interp)->errorLine
 #else
 # define NRE
 #endif
 
+#ifdef PRE87
+# define Tcl_LibraryInitProc Tcl_PackageInitProc
+# define Tcl_GetChild Tcl_GetSlave
+# define Tcl_GetParent Tcl_GetMaster
+#endif
+
+#ifdef PRE9
+# define TCL_SIZE_T int
+#else
+# define TCL_SIZE_T size_t
+#endif
 /*
  * Feature activation/deactivation
  */
@@ -512,7 +531,11 @@
  * the stubs table.
  */
 #if defined(NRE)
-# include "stubs8.6/nsfDecls.h"
+# if defined(PRE9)
+#  include "stubs8.6/nsfDecls.h"
+# else
+#  include "stubs9.0/nsfDecls.h"
+# endif
 #else
 # include "stubs8.5/nsfDecls.h"
 #endif