Index: Makefile.in
===================================================================
diff -u -r033cfdaac4e149a7c26863adfacc33020ae3d864 -r74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708
--- Makefile.in	(.../Makefile.in)	(revision 033cfdaac4e149a7c26863adfacc33020ae3d864)
+++ Makefile.in	(.../Makefile.in)	(revision 74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708)
@@ -676,10 +676,22 @@
 # Target to regenerate header files and stub files from the *.decls tables.
 #
 
+TCL_SRC_DIR_85=/usr/local/src/tcl8.5.16
+TCL_SRC_DIR_86=/usr/local/src/tcl8.6.1
+
 genstubs:
-	$(TCLSH) $(TCL_SRC_DIR)/tools/genStubs.tcl $(src_generic_dir) \
+	tclsh8.5 $(TCL_SRC_DIR_85)/tools/genStubs.tcl $(src_generic_dir) \
 		$(src_generic_dir)/nsf.decls $(src_generic_dir)/nsfInt.decls
+	mkdir -p $(src_generic_dir)/stubs8.5
+	cp $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.5
+	tclsh8.6 $(TCL_SRC_DIR_86)/tools/genStubs.tcl $(src_generic_dir) \
+		$(src_generic_dir)/nsf.decls $(src_generic_dir)/nsfInt.decls
+	mkdir -p $(src_generic_dir)/stubs8.6
+	cp $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.6
 
+getstubs:
+	$(TCLSH) $(src_app_dir_native)/utils/getstubs.tcl $(src_generic_dir)
+
 #
 # Target to check that all exported functions have an entry in the stubs
 # tables.