diff --git a/config.h-vms.template b/config.h-vms.template
index 3b4bd3b..aff7297 100644
--- a/config.h-vms.template
+++ b/config.h-vms.template
@@ -110,8 +110,11 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #undef HAVE_STRCOLL */
 
 /* Define to 1 if you have the strncasecmp' function. */
+#ifndef __CRTL_VER
+# define __CRTL_VER __VMS_VER
+#endif
 #if __CRTL_VER >= 70000000
-#define HAVE_STRNCASECMP 1
+# define HAVE_STRNCASECMP 1
 #endif
 
 /* Define to 1 if your struct stat has st_rdev.  */
@@ -373,14 +376,8 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #undef _DIRENT_HAVE_D_NAMLEN */
 
 /* On older systems without 7.0 backport of CRTL the first one is defined */
-#ifdef __CRTL_VER
-# if __CRTL_VER < 70000000
-#  define HAVE_VMSDIR_H 1
-# endif
-#else
-# if __VMS_VER < 70000000
-#  define HAVE_VMSDIR_H 1
-# endif
+#if __CRTL_VER < 70000000
+# define HAVE_VMSDIR_H 1
 #endif
 
 #if defined(HAVE_VMSDIR_H) && defined(HAVE_DIRENT_H)
diff --git a/makefile.com b/makefile.com
index 6359c47..40adf29 100644
--- a/makefile.com
+++ b/makefile.com
@@ -1,8 +1,7 @@
 $!
 $! Makefile.com - builds GNU Make for VMS
 $!
-$! P1 is non-empty if you want to link with the VAXCRTL library instead
-$!    of the shareable executable
+$! P1 = LIST will provide compiler listings.
 $! P2 = DEBUG will build an image with debug information
 $! P3 = WALL will enable all warning messages (some are suppressed since
 $!      one macro intentionally causes an error condition)
@@ -50,6 +49,12 @@ $      endif
 $   endif
 $ endif
 $!
+$!
+$ if (p1 .eqs. "LIST")
+$ then
+$   ccopt = ccopt + "/list/show=(expan,inclu)"
+$ endif
+$!
 $! Should we build a debug image
 $!
 $ if (p2.eqs."DEBUG")
@@ -67,8 +72,9 @@ $ then
 $   gosub check_cc_qual
 $ endif
 $ filelist = "alloca ar arscan commands default dir expand file function " + -
-             "hash implicit job load main misc read remake remote-stub rule " + -
-	     "output signame variable version vmsfunctions vmsify vpath " + -
+             "guile hash implicit job load main misc read remake " + -
+             "remote-stub rule output signame variable version " + -
+             "vmsfunctions vmsify vpath " + -
 	     "[.glob]glob [.glob]fnmatch getopt1 getopt strcache"
 $ copy config.h-vms config.h
 $ n=0
@@ -77,18 +83,14 @@ $ loop:
 $ cfile = f$elem(n," ",filelist)
 $ if cfile .eqs. " " then goto linkit
 $ write sys$output "Compiling ''cfile'..."
-$ call compileit 'cfile' 'p1'
+$ call compileit 'cfile'
 $ n = n + 1
 $ goto loop
 $ linkit:
 $ close optf
-$ if p1 .nes. "" then goto link_using_library
 $ link/exe=make make.opt/opt'lopt
 $ goto cleanup
 $
-$ link_using_library:
-$ link/exe=make make.opt/opt,sys$library:vaxcrtl/lib'lopt
-$
 $ cleanup:
 $ if f$trnlnm("SYS").nes."" then $ deassign sys
 $ if f$trnlnm("OPTF").nes."" then $ close optf
diff --git a/makefile.vms b/makefile.vms
index e5950b7..113ae54 100644
--- a/makefile.vms
+++ b/makefile.vms
@@ -88,13 +88,13 @@ mandir = []
 # Number to put on the man page filename.
 manext = 1
 
-#guile = ,guile.obj
+guile = ,guile.obj
 
 objs = commands.obj,job.obj,output.obj,dir.obj,file.obj,misc.obj,hash.obj,\
        load.obj,main.obj,read.obj,remake.obj,rule.obj,implicit.obj,\
        default.obj,variable.obj,expand.obj,function.obj,strcache.obj,\
-       vpath.obj,version.obj\
-       $(ARCHIVES)$(ALLOCA)$(extras)$(getopt)$(glob)$(guile)
+       vpath.obj,version.obj$(guile)\
+       $(ARCHIVES)$(ALLOCA)$(extras)$(getopt)$(glob)
 
 srcs = commands.c job.c output.c dir.c file.c misc.c guile.c hash.c \
 	load.c main.c read.c remake.c rule.c implicit.c \
@@ -131,7 +131,7 @@ file.obj: file.c makeint.h commands.h dep.h filedef.h variable.h job.h debug.h
 function.obj: function.c makeint.h variable.h dep.h commands.h filedef.h debug.h job.h
 getopt.obj: getopt.c getopt.h config.h gettext.h
 getopt1.obj: getopt1.c getopt.h config.h
-guile.obj: guile.c makeint.h debug.h dep.h gmk-default.h
+guile.obj: guile.c makeint.h debug.h dep.h
 hash.obj: hash.c makeint.h hash.h
 implicit.obj: implicit.c makeint.h rule.h dep.h filedef.h debug.h variable.h job.h commands.h
 job.obj: job.c vmsjobs.c makeint.h commands.h job.h filedef.h variable.h debug.h
diff --git a/prepare_vms.com b/prepare_vms.com
new file mode 100644
index 0000000..ef94b4c
--- /dev/null
+++ b/prepare_vms.com
@@ -0,0 +1,34 @@
+$!
+$! prepare_vms.com - Build config.h from master on VMS.
+$!
+$! This is used for building off the master instead of a release tarball.
+$!
+$!
+$! 
+$ config_template = "sys$disk:[]config.h-vms.template"
+$ close/nolog infile
+$ package=""
+$ version=""
+$ open/read infile configure.ac
+$ r_loop:
+$ read/end=r_exit/error=r_exit infile line
+$ if f$extract(0,7,line) .nes. "AC_INIT" -
+	then $ goto r_loop
+$ package = f$element (1,"[",line)
+$ package = f$element (0,"]",package)
+$ version = f$element (2,"[",line)
+$ version = f$element (0,"]",version)
+$ r_exit:
+$ close infile
+$ if (package .eqs. "") .or. (version .eqs. "")
+$ then
+$     write sys$output "unable to determine package and/or version"
+$     exit 44
+$ endif
+$ pipe (write sys$output "sub/%PACKAGE%/''package'/WHOLE/NOTYPE" ; -
+        write sys$output "sub/%VERSION%/''version'/WHOLE/NOTYPE" ; -
+        write sys$output "exit") | -
+       (define/user sys$output nla0: ; -
+        edit/edt 'config_template/out=sys$disk:[]config.h-vms/command=sys$pipe)
+$ 
+$ write sys$output package, ", version ", version, " prepared for VMS"