diff --git a/batch_job/src/batch_job_work_queue.c b/batch_job/src/batch_job_work_queue.c
index eca4f3eb68..8a0dce5497 100644
--- a/batch_job/src/batch_job_work_queue.c
+++ b/batch_job/src/batch_job_work_queue.c
@@ -63,7 +63,7 @@ static void specify_envlist( struct work_queue_task *t, struct jx *envlist )
 	if(envlist) {
 		struct jx_pair *p;
 		for(p=envlist->u.pairs;p;p=p->next) {
-			work_queue_task_specify_enviroment_variable(t,p->key->u.string_value,p->value->u.string_value);
+			work_queue_task_specify_environment_variable(t,p->key->u.string_value,p->value->u.string_value);
 		}
 	}
 }
diff --git a/batch_job/src/work_queue_factory.c b/batch_job/src/work_queue_factory.c
index 1a741bc274..4b76b1436e 100644
--- a/batch_job/src/work_queue_factory.c
+++ b/batch_job/src/work_queue_factory.c
@@ -1020,7 +1020,7 @@ static void show_help(const char *cmd)
 	printf(" %-30s Specify the linking libraries for running mesos (for use with -T mesos).\n", "--mesos-preload");
 	printf(" %-30s Specify the container image for using Kubernetes (for use with -T k8s).\n", "--k8s-image");
 	printf(" %-30s Specify the container image that contains work_queue_worker availabe for using Kubernetes (for use with -T k8s).\n", "--k8s-worker-image");
-	printf(" %-30s Send debugging to this file (can also be :stderr, :stdout, :syslog, or :journal).\n", "-o,--debug-file=<file>");
+	printf(" %-30s Send debugging to this file (can also be :stderr, or :stdout).\n", "-o,--debug-file=<file>");
 	printf(" %-30s Specify the size of the debug file (must use with -o option).\n", "-O,--debug-file-size=<mb>");
 	printf(" %-30s Specify the binary to use for the worker (relative or hard path). It should accept the same arguments as the default work_queue_worker.\n", "--worker-binary=<file>");
 	printf(" %-30s Will make a best attempt to ensure the worker will execute in the specified OS environment, regardless of the underlying OS.\n","--runos=<img>");
diff --git a/chirp/src/chirp_fuse.c b/chirp/src/chirp_fuse.c
index 6eb8569298..0a72cc9faa 100644
--- a/chirp/src/chirp_fuse.c
+++ b/chirp/src/chirp_fuse.c
@@ -583,7 +583,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, " %-30s Run in foreground for debugging.\n", "-f,--foreground");
 	fprintf(stdout, " %-30s Comma-delimited list of tickets to use for authentication.\n", "-i,--tickets=<files>");
 	fprintf(stdout, " %-30s Mount options passed to FUSE.\n", "-m,--mount-options=<options>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Timeout for network operations. (default is %ds)\n", "-t,--timeout=<timeout>", chirp_fuse_timeout);
 	fprintf(stdout, " %-30s Show program version.\n", "-v,--version");
 	fprintf(stdout, " %-30s This message.\n", "-h,--help");
diff --git a/chirp/src/chirp_server.c b/chirp/src/chirp_server.c
index b2eae72fa2..e198833a41 100644
--- a/chirp/src/chirp_server.c
+++ b/chirp/src/chirp_server.c
@@ -1846,7 +1846,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, "The most common options are:\n");
 	fprintf(stdout, " %-30s URL of storage directory, like `file://path' or `hdfs://host:port/path'.\n", "-r,--root=<url>");
 	fprintf(stdout, " %-30s Enable debugging for this subsystem.\n", "-d,--debug=<name>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Send status updates to this host. (default: `%s')\n", "-u,--advertise=<host>", CATALOG_HOST);
 	fprintf(stdout, " %-30s Show version info.\n", "-v,--version");
 	fprintf(stdout, " %-30s This message.\n", "-h,--help");
diff --git a/chirp/src/chirp_status.c b/chirp/src/chirp_status.c
index 309b1be0ef..ecf8f38c0e 100644
--- a/chirp/src/chirp_status.c
+++ b/chirp/src/chirp_status.c
@@ -46,7 +46,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, "where options are:\n");
 	fprintf(stdout, " %-30s Query the catalog on this host.\n", "-c,--catalog=<host>");
 	fprintf(stdout, " %-30s Enable debugging for this sybsystem\n", "-d,--debug=<flag>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Rotate file once it reaches this size. (default 10M, 0 disables)\n", "-O,--debug-rotate-max=<bytes>");
 	fprintf(stdout, " %-30s Only show servers with this space available. (example: -A 100MB)\n", "-A,--server-space=<size>");
 	fprintf(stdout, " %-30s Only show servers with this project.\n", "   --server-project=<name>");
diff --git a/chirp/src/chirp_tool.c b/chirp/src/chirp_tool.c
index 5775791fda..0c4d3f9ff0 100644
--- a/chirp/src/chirp_tool.c
+++ b/chirp/src/chirp_tool.c
@@ -1198,7 +1198,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, "where options are:\n");
 	fprintf(stdout, " %-30s Require this authentication mode.\n", "-a,--auth=<flag>");
 	fprintf(stdout, " %-30s Enable debugging for this subsystem.\n", "-d,--debug=<flag>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Comma-delimited list of tickets to use for authentication.\n", "-i,--tickets=<files>");
 	fprintf(stdout, " %-30s Long transfer information.\n", "-l,--verbose");
 	fprintf(stdout, " %-30s Set remote operation timeout.\n", "-t,--timeout=<time>");
diff --git a/chirp/src/confuga_adm.c b/chirp/src/confuga_adm.c
index 45c85bc543..b9b9ae1595 100644
--- a/chirp/src/confuga_adm.c
+++ b/chirp/src/confuga_adm.c
@@ -108,7 +108,7 @@ static void help (const char *argv0)
 	fprintf(stdout, "use: %s [options] <Confuga root> <cmd> [...]\n", argv0);
 	fprintf(stdout, "The most common options are:\n");
 	fprintf(stdout, " %-30s Enable debugging for this subsystem.\n", "-d,--debug=<name>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Show version info.\n", "-v,--version");
 	fprintf(stdout, " %-30s This message.\n", "-h,--help");
 	fprintf(stdout, "\n");
diff --git a/configure b/configure
index 507cbefafb..9763d505bc 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
 
 MAJOR=7
 MINOR=1
-MICRO=5
+MICRO=6
 
 # Optionally set the source/tag for this code (e.g. RC1 or FINAL).  Setting
 # this variable is instead useful for statically naming the source when it will
@@ -1317,11 +1317,6 @@ optional_include stdint.h      HAS_STDINT_H HAVE_STDINT_H
 optional_include sys/statfs.h  HAS_SYS_STATFS_H
 optional_include sys/statvfs.h HAS_SYS_STATVFS_H
 optional_include sys/vfs.h     HAS_SYS_VFS_H
-optional_include syslog.h      HAS_SYSLOG_H
-
-#if optional_library_function systemd/sd-journal.h sd_journal_print systemd HAS_SYSTEMD_JOURNAL_H; then
-#	external_libraries="${external_libraries} -lsystemd"
-#fi
 
 cctools_doctargets=
 if check_path doxygen
diff --git a/doc/man/m4/allpairs_master.m4 b/doc/man/m4/allpairs_master.m4
index 1610352f9d..cdca59c067 100644
--- a/doc/man/m4/allpairs_master.m4
+++ b/doc/man/m4/allpairs_master.m4
@@ -29,7 +29,7 @@ OPTIONS_BEGIN
 OPTION_TRIPLET(-p,port,port)The port that the master will be listening on.
 OPTION_TRIPLET(-e,extra-args,args)Extra arguments to pass to the comparison function.
 OPTION_TRIPLET(-f,input-file,file)Extra input file needed by the comparison function. (may be given multiple times)
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-O,--output-file,file)Write task output to this file (default to standard output)
 OPTION_TRIPLET(-t,estimated-time,seconds)Estimated time to run one comparison. (default chosen at runtime)
 OPTION_TRIPLET(-x,width,item)Width of one work unit, in items to compare. (default chosen at runtime)
diff --git a/doc/man/m4/catalog_server.m4 b/doc/man/m4/catalog_server.m4
index 5783744ddb..208261fd18 100644
--- a/doc/man/m4/catalog_server.m4
+++ b/doc/man/m4/catalog_server.m4
@@ -49,7 +49,7 @@ OPTION_TRIPLET(-L, update-log,file)Log new updates to this file.
 OPTION_TRIPLET(-m, max-jobs,n)Maximum number of child processes.  (default is 50)
 OPTION_TRIPLET(-M, server-size, size)Maximum size of a server to be believed.  (default is any)
 OPTION_TRIPLET(-n, name, name)Set the preferred hostname of this server.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-O, debug-rotate-max, bytes)Rotate debug file once it reaches this size (default 10M, 0 disables).
 OPTION_TRIPLET(-p,, port, port)Port number to listen on (default is 9097)
 OPTION_ITEM(`-S, --single')Single process mode; do not fork on queries.
diff --git a/doc/man/m4/chirp_fuse.m4 b/doc/man/m4/chirp_fuse.m4
index 60540a1103..d57499a260 100644
--- a/doc/man/m4/chirp_fuse.m4
+++ b/doc/man/m4/chirp_fuse.m4
@@ -35,7 +35,7 @@ OPTION_ITEM(`-D, --no-optimize')Disable small file optimizations such as recursi
 OPTION_ITEM(`-f, --foreground')Run in foreground for debugging.
 OPTION_TRIPLET(-i,tickets,files)Comma-delimited list of tickets to use for authentication.
 OPTION_TRIPLET(-m,mount-options,option)Pass mount option to FUSE. Can be specified multiple times.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-t,timeout,timeout)Timeout for network operations. (default is 60s)
 OPTION_ITEM(`-v, --version')Show program version.
 OPTION_ITEM(`-h, --help')Give help information.
diff --git a/doc/man/m4/chirp_server.m4 b/doc/man/m4/chirp_server.m4
index a904cb59bb..6a82574dc4 100644
--- a/doc/man/m4/chirp_server.m4
+++ b/doc/man/m4/chirp_server.m4
@@ -38,7 +38,7 @@ OPTION_ITEM(`-h, --help')Give help information.
 OPTION_TRIPLET(-I, interface,addr)Listen only on this network interface.
 OPTION_TRIPLET(-M, max-clients,count)Set the maximum number of clients to accept at once. (default unlimited)
 OPTION_TRIPLET(-n, catalog-name,name)Use this name when reporting to the catalog.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-O, debug-rotate-max,bytes)Rotate debug file once it reaches this size.
 OPTION_TRIPLET(-P,superuser,user)Superuser for all directories. (default is none)
 OPTION_TRIPLET(-p,port,port)Listen on this port (default is 9094, arbitrary is 0)
diff --git a/doc/man/m4/chirp_status.m4 b/doc/man/m4/chirp_status.m4
index 9e484bec51..27f2451e30 100644
--- a/doc/man/m4/chirp_status.m4
+++ b/doc/man/m4/chirp_status.m4
@@ -28,7 +28,7 @@ OPTION_ITEM(`-l, --verbose')Long output.
 OPTION_ITEM(`-T, --totals')Totals output.
 OPTION_ITEM(`-v, --version')Show program version.
 OPTION_TRIPLET(-d,debug,flag)Enable debugging for this subsystem.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-O,debug-rotate-max,bytes)Rotate file once it reaches this size.
 OPTION_ITEM(`-h, --help')Show help text.
 OPTIONS_END
diff --git a/doc/man/m4/confuga_adm.m4 b/doc/man/m4/confuga_adm.m4
index fecf1e8440..d5e6d89b6c 100644
--- a/doc/man/m4/confuga_adm.m4
+++ b/doc/man/m4/confuga_adm.m4
@@ -20,7 +20,7 @@ SECTION(OPTIONS)
 OPTIONS_BEGIN
 OPTION_TRIPLET(-d, debug, flag)Enable debugging for this sybsystem
 OPTION_ITEM(`-h, --help')Give help information.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_ITEM(`-v, --version')Show version info.
 OPTIONS_END
 
diff --git a/doc/man/m4/makeflow.m4 b/doc/man/m4/makeflow.m4
index 3b09d9b4d8..4828c5c215 100644
--- a/doc/man/m4/makeflow.m4
+++ b/doc/man/m4/makeflow.m4
@@ -88,7 +88,7 @@ OPTIONS_END
 SUBSECTION(Debugging Options)
 OPTIONS_BEGIN
 OPTION_TRIPLET(-d, debug, subsystem)Enable debugging for this subsystem.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_PAIR(--debug-rotate-max, byte)Rotate debug file once it reaches this size.
 OPTION_ITEM(`--verbose')Display runtime progress on stdout.
 OPTIONS_END
diff --git a/doc/man/m4/parrot_package_create.m4 b/doc/man/m4/parrot_package_create.m4
index d32d9a9a6f..26c91ca59b 100644
--- a/doc/man/m4/parrot_package_create.m4
+++ b/doc/man/m4/parrot_package_create.m4
@@ -18,7 +18,7 @@ OPTION_ITEM(`    --new-env')The relative path of the environment variable file u
 OPTION_TRIPLET(-n, name-list, path)The path of the namelist list.
 OPTION_TRIPLET(-p, package-path, path)The path of the package.
 OPTION_TRIPLET(-d, debug, flag)Enable debugging for this sub-system.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_ITEM(`-h, --help')Show the help info.
 OPTIONS_END
 
diff --git a/doc/man/m4/parrot_run.m4 b/doc/man/m4/parrot_run.m4
index 588b2c1f1a..7cb049fed7 100644
--- a/doc/man/m4/parrot_run.m4
+++ b/doc/man/m4/parrot_run.m4
@@ -40,7 +40,7 @@ OPTION_TRIPLET(-e, env-list, path)Record the environment variables.
 OPTION_TRIPLET(-n, name-list, path)Record all the file names.
 OPTION_ITEM(--no-set-foreground)Disable changing the foreground process group of the session.
 OPTION_TRIPLET(-N, hostname, name)Pretend that this is my hostname.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-O, debug-rotate-max, bytes)Rotate debug files of this size.
 OPTION_TRIPLET(-p, proxy, host:port)Use this proxy server for HTTP requests.
 OPTION_ITEM(-Q, --no-chirp-catalog)Inhibit catalog queries to list /chirp.
diff --git a/doc/man/m4/resource_monitor.m4 b/doc/man/m4/resource_monitor.m4
index ab3425317f..00d04d8597 100644
--- a/doc/man/m4/resource_monitor.m4
+++ b/doc/man/m4/resource_monitor.m4
@@ -96,7 +96,7 @@ LONGCODE_END
 SECTION(OPTIONS)
 OPTIONS_BEGIN
 OPTION_TRIPLET(-d,debug,subsystem)Enable debugging for this subsystem.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_ITEM(`-v,--version')Show version string.
 OPTION_ITEM(`-h,--help')Show help text.
 OPTION_TRIPLET(-i,interval,n)Maximum interval between observations, in seconds (default=1).
diff --git a/doc/man/m4/resource_monitor_histograms.m4 b/doc/man/m4/resource_monitor_histograms.m4
index a6fd37cad0..2c620938ce 100644
--- a/doc/man/m4/resource_monitor_histograms.m4
+++ b/doc/man/m4/resource_monitor_histograms.m4
@@ -51,7 +51,7 @@ LONGCODE_END
 SUBSECTION(Debugging Options)
 OPTIONS_BEGIN
 OPTION_TRIPLET(-d, debug, subsystem)Enable debugging for this subsystem.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_ITEM(`--verbose')Display runtime progress on stdout.
 OPTIONS_END
 
diff --git a/doc/man/m4/wavefront_master.m4 b/doc/man/m4/wavefront_master.m4
index cde515415c..3ecce6a510 100644
--- a/doc/man/m4/wavefront_master.m4
+++ b/doc/man/m4/wavefront_master.m4
@@ -28,7 +28,7 @@ OPTION_ITEM(`-h, --help')Show this help screen
 OPTION_ITEM(`-v, --version')Show version string
 OPTION_TRIPLET(-d, debug, subsystem)Enable debugging for this subsystem. (Try -d all to start.)
 OPTION_TRIPLET(-N, project-name, project)Set the project name to <project>
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_TRIPLET(-p, port, port)Port number for queue master to listen on.
 OPTION_TRIPLET(-P, priority, num)Priority. Higher the value, higher the priority.
 OPTION_TRIPLET(-Z, port-file, file)Select port at random and write it to this file.  (default is disabled)
diff --git a/doc/man/m4/work_queue_factory.m4 b/doc/man/m4/work_queue_factory.m4
index 67d9b2916d..c0b32a56a3 100644
--- a/doc/man/m4/work_queue_factory.m4
+++ b/doc/man/m4/work_queue_factory.m4
@@ -78,7 +78,7 @@ OPTION_PAIR(--mesos-path,filepath)Specify path to mesos python library (for use
 OPTION_PAIR(--mesos-preload,library)Specify the linking libraries for running mesos (for use with -T mesos).
 OPTION_ITEM(--k8s-image)Specify the container image for using Kubernetes (for use with -T k8s).
 OPTION_ITEM(--k8s-worker-image)Specify the container image that contains work_queue_worker availabe for using Kubernetes (for use with -T k8s).
-OPTION_TRIPLET(-o,debug-file,file)Send debugging to this file (can also be :stderr, :stdout, :syslog, or :journal).
+OPTION_TRIPLET(-o,debug-file,file)Send debugging to this file (can also be :stderr, or :stdout).
 OPTION_TRIPLET(-O,debug-file-size,mb)Specify the size of the debug file (must use with -o option).
 OPTION_PAIR(--worker-binary,file)Specify the binary to use for the worker (relative or hard path). It should accept the same arguments as the default work_queue_worker.
 OPTION_PAIR(--runos,img)Will make a best attempt to ensure the worker will execute in the specified OS environment, regardless of the underlying OS.
diff --git a/doc/man/m4/work_queue_status.m4 b/doc/man/m4/work_queue_status.m4
index a7a079ae3f..59b7152ad9 100644
--- a/doc/man/m4/work_queue_status.m4
+++ b/doc/man/m4/work_queue_status.m4
@@ -37,7 +37,7 @@ OPTION_ITEM(`-l, --verbose')Long output.
 OPTION_TRIPLET(-C, catalog, catalog)Set catalog server to <catalog>. Format: HOSTNAME:PORT
 OPTION_TRIPLET(-d, debug, flag)Enable debugging for the given subsystem. Try -d all as a start.
 OPTION_TRIPLET(-t, timeout, time)RPC timeout (default=300s).
-OPTION_TRIPLET(-o, debug-file, file)Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)
+OPTION_TRIPLET(-o, debug-file, file)Send debugging to this file. (can also be :stderr, or :stdout)
 OPTION_TRIPLET(-O, debug-rotate-max, bytes)Rotate debug file once it reaches this size.
 OPTION_ITEM(`-v, --version')Show work_queue_status version.
 OPTION_ITEM(`-h, --help')Show this help message.
diff --git a/doc/man/m4/work_queue_worker.m4 b/doc/man/m4/work_queue_worker.m4
index 9e6a1eb85a..b8950c20c7 100644
--- a/doc/man/m4/work_queue_worker.m4
+++ b/doc/man/m4/work_queue_worker.m4
@@ -44,7 +44,7 @@ OPTION_ITEM(-h, --help')Show this help message.
 OPTION_TRIPLET(-N,-M, master-name, name)Set the name of the project this worker should work for.  A worker can have multiple projects.
 OPTION_TRIPLET(-C, catalog, catalog)Set catalog server to PARAM(catalog). Format: HOSTNAME:PORT
 OPTION_TRIPLET(-d, debug, flag)Enable debugging for the given subsystem. Try -d all as a start.
-OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+OPTION_TRIPLET(-o,debug-file,file)Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 OPTION_PAIR(--debug-max-rotate, bytes)Set the maximum file size of the debug log.  If the log exceeds this size, it is renamed to "filename.old" and a new logfile is opened.  (default=10M. 0 disables)
 OPTION_ITEM(--debug-release-reset)Debug file will be closed, renamed, and a new one opened after being released from a master.
 OPTION_ITEM(`--foreman')Enable foreman mode.
diff --git a/doc/man/md/allpairs_master.md b/doc/man/md/allpairs_master.md
index 42b8b27480..6a1f81604b 100644
--- a/doc/man/md/allpairs_master.md
+++ b/doc/man/md/allpairs_master.md
@@ -51,7 +51,7 @@ process and begin executing tasks.
 - **-p --port <port>** The port that the master will be listening on.
 - **-e --extra-args <args>** Extra arguments to pass to the comparison function.
 - **-f --input-file <file>** Extra input file needed by the comparison function. (may be given multiple times)
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-O ----output-file <file>** Write task output to this file (default to standard output)
 - **-t --estimated-time <seconds>** Estimated time to run one comparison. (default chosen at runtime)
 - **-x --width <item>** Width of one work unit, in items to compare. (default chosen at runtime)
diff --git a/doc/man/md/catalog_server.md b/doc/man/md/catalog_server.md
index 559ec8bf2f..3eb6703204 100644
--- a/doc/man/md/catalog_server.md
+++ b/doc/man/md/catalog_server.md
@@ -71,7 +71,7 @@ overwriting another service's record.
 - **-m --max-jobs <n>** Maximum number of child processes.  (default is 50)
 - **-M --server-size <size>** Maximum size of a server to be believed.  (default is any)
 - **-n --name <name>** Set the preferred hostname of this server.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-O --debug-rotate-max <bytes>** Rotate debug file once it reaches this size (default 10M, 0 disables).
 - **-p -- <port>** Port number to listen on (default is 9097)
 - **-S, --single** Single process mode; do not fork on queries.
diff --git a/doc/man/md/chirp_fuse.md b/doc/man/md/chirp_fuse.md
index 03ec9bf18b..1bf30d917d 100644
--- a/doc/man/md/chirp_fuse.md
+++ b/doc/man/md/chirp_fuse.md
@@ -57,7 +57,7 @@ For complete details with examples, see the
 - **-f, --foreground** Run in foreground for debugging.
 - **-i --tickets <files>** Comma-delimited list of tickets to use for authentication.
 - **-m --mount-options <option>** Pass mount option to FUSE. Can be specified multiple times.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-t --timeout <timeout>** Timeout for network operations. (default is 60s)
 - **-v, --version** Show program version.
 - **-h, --help** Give help information.
diff --git a/doc/man/md/chirp_server.md b/doc/man/md/chirp_server.md
index f5b29a3c1c..4592122eeb 100644
--- a/doc/man/md/chirp_server.md
+++ b/doc/man/md/chirp_server.md
@@ -60,7 +60,7 @@ For complete details with examples, see the [Chirp User's Manual](http://ccl.cse
 - **-I --interface <addr>** Listen only on this network interface.
 - **-M --max-clients <count>** Set the maximum number of clients to accept at once. (default unlimited)
 - **-n --catalog-name <name>** Use this name when reporting to the catalog.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-O --debug-rotate-max <bytes>** Rotate debug file once it reaches this size.
 - **-P --superuser <user>** Superuser for all directories. (default is none)
 - **-p --port <port>** Listen on this port (default is 9094, arbitrary is 0)
diff --git a/doc/man/md/chirp_status.md b/doc/man/md/chirp_status.md
index 01553cdb77..b10789a9f0 100644
--- a/doc/man/md/chirp_status.md
+++ b/doc/man/md/chirp_status.md
@@ -50,7 +50,7 @@ When using **chirp_status** with long form option (-l), it lists additional info
 - **-T, --totals** Totals output.
 - **-v, --version** Show program version.
 - **-d --debug <flag>** Enable debugging for this subsystem.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-O --debug-rotate-max <bytes>** Rotate file once it reaches this size.
 - **-h, --help** Show help text.
 
diff --git a/doc/man/md/confuga_adm.md b/doc/man/md/confuga_adm.md
index 18796e9986..1eb4aafd21 100644
--- a/doc/man/md/confuga_adm.md
+++ b/doc/man/md/confuga_adm.md
@@ -42,7 +42,7 @@ For complete details with examples, see the [Confuga User's Manual](http://ccl.c
 
 - **-d --debug <flag>** Enable debugging for this sybsystem
 - **-h, --help** Give help information.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-v, --version** Show version info.
 
 
diff --git a/doc/man/md/makeflow.md b/doc/man/md/makeflow.md
index fb23f4aa71..504f237971 100644
--- a/doc/man/md/makeflow.md
+++ b/doc/man/md/makeflow.md
@@ -110,7 +110,7 @@ OPTION_END
 ### Debugging Options
 
 - **-d --debug <subsystem>** Enable debugging for this subsystem.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **--debug-rotate-max byte** Rotate debug file once it reaches this size.
 - **--verbose** Display runtime progress on stdout.
 
diff --git a/doc/man/md/parrot_package_create.md b/doc/man/md/parrot_package_create.md
index 6d1a1195dd..f6b05b431b 100644
--- a/doc/man/md/parrot_package_create.md
+++ b/doc/man/md/parrot_package_create.md
@@ -40,7 +40,7 @@ After recording the accessed files and environment variables of one program with
 - **-n --name-list <path>** The path of the namelist list.
 - **-p --package-path <path>** The path of the package.
 - **-d --debug <flag>** Enable debugging for this sub-system.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-h, --help** Show the help info.
 
 
diff --git a/doc/man/md/parrot_run.md b/doc/man/md/parrot_run.md
index 49026d4b63..06033eb06c 100644
--- a/doc/man/md/parrot_run.md
+++ b/doc/man/md/parrot_run.md
@@ -62,7 +62,7 @@ For complete details with examples, see the [Parrot User's Manual](http://ccl.cs
 - **-n --name-list <path>** Record all the file names.
 - **--no-set-foreground** Disable changing the foreground process group of the session.
 - **-N --hostname <name>** Pretend that this is my hostname.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-O --debug-rotate-max <bytes>** Rotate debug files of this size.
 - **-p --proxy <host:port>** Use this proxy server for HTTP requests.
 - **-Q** Inhibit catalog queries to list /chirp.
diff --git a/doc/man/md/resource_monitor.md b/doc/man/md/resource_monitor.md
index d9895ea20d..8f92366962 100644
--- a/doc/man/md/resource_monitor.md
+++ b/doc/man/md/resource_monitor.md
@@ -118,7 +118,7 @@ disk                      current size of working directories in the tree, in MB
 ## OPTIONS
 
 - **-d --debug <subsystem>** Enable debugging for this subsystem.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-v,--version** Show version string.
 - **-h,--help** Show help text.
 - **-i --interval <n>** Maximum interval between observations, in seconds (default=1).
diff --git a/doc/man/md/resource_monitor_histograms.md b/doc/man/md/resource_monitor_histograms.md
index ba3bcb56a1..3aaf67b47a 100644
--- a/doc/man/md/resource_monitor_histograms.md
+++ b/doc/man/md/resource_monitor_histograms.md
@@ -73,7 +73,7 @@ wall_time
 ### Debugging Options
 
 - **-d --debug <subsystem>** Enable debugging for this subsystem.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **--verbose** Display runtime progress on stdout.
 
 
diff --git a/doc/man/md/wavefront_master.md b/doc/man/md/wavefront_master.md
index 9682a97317..a42182193b 100644
--- a/doc/man/md/wavefront_master.md
+++ b/doc/man/md/wavefront_master.md
@@ -50,7 +50,7 @@ then connect back to the master process and begin executing tasks.
 - **-v, --version** Show version string
 - **-d --debug <subsystem>** Enable debugging for this subsystem. (Try -d all to start.)
 - **-N --project-name <project>** Set the project name to <project>
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **-p --port <port>** Port number for queue master to listen on.
 - **-P --priority <num>** Priority. Higher the value, higher the priority.
 - **-Z --port-file <file>** Select port at random and write it to this file.  (default is disabled)
diff --git a/doc/man/md/work_queue_factory.md b/doc/man/md/work_queue_factory.md
index 5209307666..f55a24b77e 100644
--- a/doc/man/md/work_queue_factory.md
+++ b/doc/man/md/work_queue_factory.md
@@ -100,7 +100,7 @@ remove all running workers before exiting.
 - **--mesos-preload library** Specify the linking libraries for running mesos (for use with -T mesos).
 - **--k8s-image** Specify the container image for using Kubernetes (for use with -T k8s).
 - **--k8s-worker-image** Specify the container image that contains work_queue_worker availabe for using Kubernetes (for use with -T k8s).
-- **-o --debug-file <file>** Send debugging to this file (can also be :stderr, :stdout, :syslog, or :journal).
+- **-o --debug-file <file>** Send debugging to this file (can also be :stderr, or :stdout).
 - **-O --debug-file-size <mb>** Specify the size of the debug file (must use with -o option).
 - **--worker-binary file** Specify the binary to use for the worker (relative or hard path). It should accept the same arguments as the default work_queue_worker.
 - **--runos img** Will make a best attempt to ensure the worker will execute in the specified OS environment, regardless of the underlying OS.
diff --git a/doc/man/md/work_queue_status.md b/doc/man/md/work_queue_status.md
index b50e055671..317235cfe3 100644
--- a/doc/man/md/work_queue_status.md
+++ b/doc/man/md/work_queue_status.md
@@ -59,7 +59,7 @@ more detailed information about tasks and workers.
 - **-C --catalog <catalog>** Set catalog server to <catalog>. Format: HOSTNAME:PORT
 - **-d --debug <flag>** Enable debugging for the given subsystem. Try -d all as a start.
 - **-t --timeout <time>** RPC timeout (default=300s).
-- **-o --debug-file <file>** Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)
+- **-o --debug-file <file>** Send debugging to this file. (can also be :stderr, or :stdout)
 - **-O --debug-rotate-max <bytes>** Rotate debug file once it reaches this size.
 - **-v, --version** Show work_queue_status version.
 - **-h, --help** Show this help message.
diff --git a/doc/man/md/work_queue_worker.md b/doc/man/md/work_queue_worker.md
index 53b320787e..ccf5ef32d2 100644
--- a/doc/man/md/work_queue_worker.md
+++ b/doc/man/md/work_queue_worker.md
@@ -66,7 +66,7 @@ grid or cloud computing environments such as SGE, PBS, SLURM, and HTCondor using
 - **-N ---M <master-name>** Set the name of the project this worker should work for.  A worker can have multiple projects.
 - **-C --catalog <catalog>** Set catalog server to <catalog>. Format: HOSTNAME:PORT
 - **-d --debug <flag>** Enable debugging for the given subsystem. Try -d all as a start.
-- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs be sent to stdout (":stdout"), to the system syslog (":syslog"), or to the systemd journal (":journal").
+- **-o --debug-file <file>** Write debugging output to this file. By default, debugging is sent to stderr (":stderr"). You may specify logs to be sent to stdout (":stdout") instead.
 - **--debug-max-rotate bytes** Set the maximum file size of the debug log.  If the log exceeds this size, it is renamed to "filename.old" and a new logfile is opened.  (default=10M. 0 disables)
 - **--debug-release-reset** Debug file will be closed, renamed, and a new one opened after being released from a master.
 - **--foreman** Enable foreman mode.
diff --git a/dttools/src/auth_test.c b/dttools/src/auth_test.c
index 5c5ed3f4a2..8f0278b5fe 100644
--- a/dttools/src/auth_test.c
+++ b/dttools/src/auth_test.c
@@ -24,7 +24,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, "Where options are:\n");
 	fprintf(stdout, " %-30s This message\n", "-h,--help=<flag>");
 	fprintf(stdout, " %-30s Debugging\n", "-d,--debug=<flag>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Rotate debug files of this size (default 10M, 0 disables)\n", "-O,--debug-rotate-max=<bytes>");
 	fprintf(stdout, " %-30s Allow this auth type\n", "-a,--auth=<type>");
 	fprintf(stdout, " %-30s Port number\n", "-p,--port=<num>");
diff --git a/dttools/src/catalog_query_tool.c b/dttools/src/catalog_query_tool.c
index 7b8b653f9b..8fef26b3ea 100644
--- a/dttools/src/catalog_query_tool.c
+++ b/dttools/src/catalog_query_tool.c
@@ -39,7 +39,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, " %-30s Filter results by this expression.\n", "-w,--where=<expr>");
 	fprintf(stdout, " %-30s Query the catalog on this host.\n", "-c,--catalog=<host>");
 	fprintf(stdout, " %-30s Enable debugging for this sybsystem\n", "-d,--debug=<flag>");
-	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-30s Rotate file once it reaches this size. (default 10M, 0 disables)\n", "-O,--debug-rotate-max=<bytes>");
 	fprintf(stdout, " %-30s Timeout.\n", "-t,--timeout=<time>");
 	fprintf(stdout, " %-30s This message.\n", "-h,--help");
diff --git a/dttools/src/catalog_server.c b/dttools/src/catalog_server.c
index 9a9af77c57..5cb89350e2 100644
--- a/dttools/src/catalog_server.c
+++ b/dttools/src/catalog_server.c
@@ -580,7 +580,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, " %-30s (default is any)\n", "");
 	fprintf(stdout, " %-30s Preferred host name of this server.\n", "-n,--name=<name>");
 	fprintf(stdout, " %-30s Send debugging to this file. (can also\n", "-o,--debug-file=<file>");
-	fprintf(stdout, " %-30s be :stderr, :stdout, :syslog, or :journal)\n", "");
+	fprintf(stdout, " %-30s be :stderr, or :stdout)\n", "");
 	fprintf(stdout, " %-30s Rotate debug file once it reaches this size.\n", "-O,--debug-rotate-max=<bytes>");
 	fprintf(stdout, " %-30s (default 10M, 0 disables)\n", "");
 	fprintf(stdout, " %-30s Port number to listen on (default is %d)\n", "-p,--port=<port>", port);
diff --git a/dttools/src/debug.c b/dttools/src/debug.c
index b6ae8cc4ff..e3f2d2a587 100644
--- a/dttools/src/debug.c
+++ b/dttools/src/debug.c
@@ -32,25 +32,11 @@ extern int debug_file_path (const char *path);
 extern void debug_file_rename (const char *suffix);
 extern int debug_file_reopen (void);
 
-#ifdef HAS_SYSLOG_H
-extern void debug_syslog_write (int64_t flags, const char *str);
-extern void debug_syslog_config (const char *name);
-#endif
-
-#ifdef HAS_SYSTEMD_JOURNAL_H
-extern void debug_journal_write (int64_t flags, const char *str);
-#endif
-
-
 static void (*debug_write) (int64_t flags, const char *str) = debug_stderr_write;
 static pid_t (*debug_getpid) (void) = getpid;
 static char debug_program_name[PATH_MAX];
 static int64_t debug_flags = D_NOTICE|D_ERROR|D_FATAL;
 
-static char *terminal_path = "/dev/tty";
-static FILE *terminal_f    = NULL;
-static int   terminal_available = 1;
-
 struct flag_info {
 	const char *name;
 	int64_t flag;
@@ -208,18 +194,8 @@ static void do_debug(int64_t flags, const char *fmt, va_list args)
 
 	debug_write(flags, buffer_tostring(&B));
 
-	if(terminal_available && (flags & (D_ERROR | D_NOTICE | D_FATAL))) {
-		if(debug_write != debug_stderr_write || !isatty(STDERR_FILENO)) {
-			if(!terminal_f) {
-				if((terminal_f = fopen(terminal_path, "a")) == NULL) {
-					/* print to wherever stderr is pointing that we could not open the terminal. */
-					terminal_available = 0;
-				}
-			}
-		}
-
-		if(terminal_f)
-			fprintf(terminal_f, "%s", buffer_tostring(&B));
+	if(debug_write != debug_stderr_write && (flags & (D_ERROR | D_NOTICE | D_FATAL))) {
+		debug_stderr_write(flags, buffer_tostring(&B));
 	}
 
 	buffer_free(&B);
@@ -304,21 +280,6 @@ int debug_config_file_e (const char *path)
 	} else if(strcmp(path, ":stdout") == 0) {
 		debug_write = debug_stdout_write;
 		return 0;
-	} else if (strcmp(path, ":syslog") == 0) {
-#ifdef HAS_SYSLOG_H
-		debug_write = debug_syslog_write;
-		debug_syslog_config(debug_program_name);
-		return 0;
-#else
-		return errno = EINVAL, -1;
-#endif
-	} else if (strcmp(path, ":journal") == 0) {
-#ifdef HAS_SYSTEMD_JOURNAL_H
-		debug_write = debug_journal_write;
-		return 0;
-#else
-		return errno = EINVAL, -1;
-#endif
 	} else {
 		debug_write = debug_file_write;
 		return debug_file_path(path);
diff --git a/parrot/src/parrot_package_create.c b/parrot/src/parrot_package_create.c
index fcfdebe89c..a9ead8c7de 100644
--- a/parrot/src/parrot_package_create.c
+++ b/parrot/src/parrot_package_create.c
@@ -50,7 +50,7 @@ static void show_help(const char *cmd)
 	fprintf(stdout, " %-34s The path of the namelist list.\n", "-n,--name-list=<listpath>");
 	fprintf(stdout, " %-34s The path of the package.\n", "-p,--package-path=<packagepath>");
 	fprintf(stdout, " %-34s Enable debugging for this sub-system.    (PARROT_DEBUG_FLAGS)\n", "-d,--debug=<name>");
-	fprintf(stdout, " %-34s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal) (PARROT_DEBUG_FILE)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, " %-34s Send debugging to this file. (can also be :stderr, or :stdout) (PARROT_DEBUG_FILE)\n", "-o,--debug-file=<file>");
 	fprintf(stdout, " %-34s Show the help info.\n", "-h,--help");
 	return;
 }
diff --git a/parrot/src/pfs_main.cc b/parrot/src/pfs_main.cc
index e66a423051..378fd65f90 100644
--- a/parrot/src/pfs_main.cc
+++ b/parrot/src/pfs_main.cc
@@ -249,7 +249,7 @@ static void show_help( const char *cmd )
 	printf( " %-30s Maximum amount of time to retry failures.    (PARROT_TIMEOUT)\n", "-T,--timeout=<time>");
 	printf( " %-30s Enable debugging for this sub-system.    (PARROT_DEBUG_FLAGS)\n", "-d,--debug=<name>");
 	printf( " %-30s Send debugging to this file.              (PARROT_DEBUG_FILE)\n", "-o,--debug-file=<file>");
-	printf( " %-30s     (can also be :stderr, :stdout, :syslog, or :journal)\n", "");
+	printf( " %-30s     (can also be :stderr, or :stdout)\n", "");
 	printf( " %-30s Rotate debug files of this size.     (PARROT_DEBUG_FILE_SIZE)\n", "-O,--debug-rotate-max=<bytes>");
 	printf( " %-30s     (default 10M, 0 disables)\n","");
 	printf( " %-30s Display version number.\n", "-v,--version");
diff --git a/python_environments/src/python_package_run b/python_environments/src/python_package_run
index 736c39ffde..92d9349928 100755
--- a/python_environments/src/python_package_run
+++ b/python_environments/src/python_package_run
@@ -4,18 +4,67 @@
 # This software is distributed under the GNU General Public License.
 # See the file COPYING for details.
 
+# Executes a command line inside a conda environment.
+# The conda environment can be supplied via a tar file or a directory.
+#
+# It is assumed that the conda environment can be used in the absence of a
+# local conda installation. This means it should include conda and conda-unpack
+# itself. This requirement can be fulfilled with the generic recipe shown with
+# the --help-env-creation option:
+#
+
+start_time=$(date +'%s%N')
+
 usage() {
     echo "Usage: python_package_run [options] -e <file> command and args ..."
     echo "where options are:"
-    echo " -e, --environment <file>   Conda environment as a tar file. (Required.)"
-    echo " -d, --unpack-to <dir>      Directory to unpack the environment. If not given,"
-    echo "                            a temporary directory is used."
+    echo " -e, --environment <path>   Conda environment as a tar file or a directory. (Required.)"
+    echo " -u, --unpack-to <dir>      Directory to unpack the environment. If not given,"
+    echo "                            a temporary directory is used. If the argument to"
+    echo "                            --environment is a directory, --unpack-to is ignored."
     echo " -w, --wait-for-lock <secs> Number of seconds to wait to get a writing lock"
     echo "                            on <dir>. Default is 300"
-    echo " -h, --help                 Show this help screen"
+    echo " -d, --debug                Print debug messages."
+    echo " --help-env-creation        Show instructions to create conda environments as tar files."
+    echo " -h, --help                 Show this help screen."
     echo "command and args            Command to execute inside the given environment."
     echo
-    exit 1
+}
+
+function help_env_creation {
+cat << EOF
+
+Environments should include conda and conda-unpack so they can be used
+in the absence of a local conda installation. Environment creation follows
+the generic recipe:
+
+$ conda create --prefix ./my-conda-env python=X.XX conda
+$ source ./my-conda-env/bin/activate
+$ conda install -c conda-forge conda-pack
+... conda and pip install rest of packages ...
+$ python -c 'import conda_pack; conda_pack.pack(prefix="my-conda-env")
+
+The above generates my-conda-env.tar.gz ready to be used by this script as:
+
+$0 --environment my-conda-env.tar.gz -- python -c 'print(42)'
+
+The directory ./my-conda-env can be safely removed.
+
+EOF
+}
+
+
+function logmsg {
+    if [[ "${PYTHON_PACKAGE_RUN_DEBUG}" = yes ]]
+    then
+        printf "%s python_package_run: " "$(date +'%Y-%m-%dT%T.%N')"
+        echo "$@"
+    fi
+}
+
+function errmsg {
+    local PYTHON_PACKAGE_RUN_DEBUG=yes
+    logmsg "$@"
 }
 
 UNPACK_TO=
@@ -30,11 +79,19 @@ parse_arguments() {
 		case $1 in
 			-h | --help)
                 usage
+                exit 0
                 ;;
-            -d | --unpack-to)
+			--help-env*)
+                help_env_creation
+                exit 0
+                ;;
+            -u | --unpack-to)
                 shift
                 UNPACK_TO="$1"
                 ;;
+            -d | --debug)
+                export PYTHON_PACKAGE_RUN_DEBUG=yes
+                ;;
             -e | --environment)
                 shift
                 ENV_NAME="$1"
@@ -43,6 +100,10 @@ parse_arguments() {
                 shift
                 LOCK_WAIT="$1"
                 ;;
+            --)
+                shift
+                break
+                ;;
             *)
                 break
                 ;;
@@ -50,16 +111,16 @@ parse_arguments() {
         shift
     done
 
-    if [ -z "${ENV_NAME}" ]
+    if [[ -z "${ENV_NAME}" ]]
     then
-        echo "An environment tarball should be specified with the --environment option."
+        errmsg "a tarball or directory should be specified with the --environment option."
         usage
         exit 1
     fi
 
-    if [ $# -lt 1 ]
+    if [[ $# -lt 1 ]]
     then
-        echo "No command line was specified."
+        errmsg "no command line was specified."
         usage
         exit 1
     fi
@@ -71,85 +132,117 @@ parse_arguments() {
 }
 
 function cleanup {
-    if [ "${UNPACK_IS_TMP}" = yes ]
+    if [[ "${UNPACK_IS_TMP}" = yes ]]
     then
         rm -rf "${UNPACK_TO}"
     fi
 
     rm -f "${UNTAR_SCRIPT}"
+
+    end_time=$(date +'%s%N')
+
+    ns=$((end_time-start_time))
+    s=$((ns/1000000000))
+    ns=$((ns-s))
+
+    logmsg total runtime: ${s}.${ns} seconds
 }
 trap cleanup EXIT
 
 parse_arguments "$@"
 
-
 #after shift, whatever is left is taken as the command line to execute.
 arg_counsumed=$?
 shift ${arg_counsumed}
 
+ENV_NAME_IS_DIR=no
 UNPACK_IS_TMP=no
 NEED_TO_UNPACK=yes
 
-if [ -z "${UNPACK_TO}" ]
+if [[ -d "${ENV_NAME}" ]]
+then
+    ENV_NAME_IS_DIR=yes
+
+    if [[ -n "${UNPACK_TO}" ]]
+    then
+        errmsg "ignoring --unpack-to argument as --environment is a directory." 
+    fi
+
+    UNPACK_TO="${ENV_NAME}"
+fi
+
+if [[ -z "${UNPACK_TO}" ]]
 then
     UNPACK_IS_TMP=yes
     UNPACK_TO="$(mktemp -d)"
 fi
 
 UNPACK_TO=$(realpath ${UNPACK_TO})
-echo Unpacking conda environment to ${UNPACK_TO}
+logmsg setting up conda environment at ${UNPACK_TO}
 
-if [ -f "${UNPACK_TO}" ]
+if [[ -f "${UNPACK_TO}" ]]
 then
-    echo "--unpack-to argument is an already existing file. It should be the name of a directory."
+    errmsg "--unpack-to argument is an already existing file. It should be the name of a directory."
     exit 1
 fi
 
+# unpacking environment if needed...
+LOCKFILE="${UNPACK_TO}/.unpacking_python_package_run_lock"
+mkdir -p "${UNPACK_TO}"
+
 UNTAR_SCRIPT=$(mktemp python_package_run.XXXXXX)
 cat > ${UNTAR_SCRIPT} << EOF
-if [ "\$(find ${UNPACK_TO} -mindepth 1 -maxdepth 1 | wc -l)" = 1 ]
+if [ "\$(find ${UNPACK_TO} -mindepth 1 -maxdepth 1 -not -name $(basename ${LOCKFILE}) | wc -l)" = 0 ]
 then
     # Directory is empty (the only file there is the lock). It is safe to untar.
     if ! tar -xf "${ENV_NAME}" -C "${UNPACK_TO}"
     then
-        echo "Could not uncompress environment: ${ENV_NAME}"
+        echo "python_package_run: could not uncompress environment: ${ENV_NAME}"
         exit 1
     fi
 else
-    echo "Directory ${UNPACK_TO} is not empty. Not unpacking environment again."
+    if [[ "${PYTHON_PACKAGE_RUN_DEBUG}" = yes ]]
+    then
+        echo "python_package_run: directory ${UNPACK_TO} is not empty. Not expanding environment file again."
+    fi
 fi
 exit 0
 EOF
 
-# unpacking environment if needed.
-LOCKFILE="${UNPACK_TO}/.unpacking_python_package_run_lock"
-mkdir -p "${UNPACK_TO}"
-
-flock -w ${LOCK_WAIT} ${LOCKFILE} -c "/bin/sh ${UNTAR_SCRIPT}"
-if [ "$?" != 0 ]
+if [[ "${ENV_NAME_IS_DIR}" = no ]]
 then
-    echo -e "Could not untar environment: ${ENV_NAME}"
-    exit 1
+    logmsg expanding environment file
+    flock -w ${LOCK_WAIT} ${LOCKFILE} -c "/bin/sh ${UNTAR_SCRIPT}"
+    if [ "$?" != 0 ]
+    then
+        errmsg "could not untar environment: ${ENV_NAME}"
+        exit 1
+    fi
 fi
 
 #activate and unpack the environment
+logmsg activating environment
 unset PYTHONPATH
 source "${UNPACK_TO}/bin/activate"
 if [ "$?" != 0 ]
 then
-    echo -e "Could not activate environment: ${ENV_NAME}"
+    errmsg "could not activate environment: ${ENV_NAME}"
     exit 1
 fi
 
+logmsg relocating paths
 flock -w ${LOCK_WAIT} ${LOCKFILE} conda-unpack
 if [ "$?" != 0 ]
 then
-    echo -e "Could not unpack environment: ${ENV_NAME}"
+    errmsg "could not unpack environment: ${ENV_NAME}"
     exit 1
 fi
 
 # Finally run the command line:
+logmsg executing command line: "${@}"
 "${@}"
 status=$?
 
+logmsg command line exit code: $status
+
 exit $status
diff --git a/resource_monitor/src/resource_monitor.c b/resource_monitor/src/resource_monitor.c
index 1f6928923c..ed0cb99acd 100644
--- a/resource_monitor/src/resource_monitor.c
+++ b/resource_monitor/src/resource_monitor.c
@@ -2006,6 +2006,10 @@ struct rmonitor_process_info *spawn_first_process(const char *executable, char *
 
         debug(D_RMON, "executing: %s\n", executable);
 
+		char *pid_s = string_format("%d", getpid());
+		setenv(RESOURCE_MONITOR_ROOT_PROCESS, pid_s, 1);
+		free(pid_s);
+
 		errno = 0;
         execvp(executable, argv);
         //We get here only if execlp fails.
@@ -2024,7 +2028,7 @@ static void show_help(const char *cmd)
 {
     fprintf(stdout, "\nUse: %s [options] -- command-line-and-options\n\n", cmd);
     fprintf(stdout, "%-30s Enable debugging for this subsystem.\n", "-d,--debug=<subsystem>");
-	fprintf(stdout, "%-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	fprintf(stdout, "%-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
     fprintf(stdout, "%-30s Show this message.\n", "-h,--help");
     fprintf(stdout, "%-30s Show version string.\n", "-v,--version");
     fprintf(stdout, "\n");
diff --git a/resource_monitor/src/resource_monitor_histograms.c b/resource_monitor/src/resource_monitor_histograms.c
index f91433cce0..fd4c22b4bb 100644
--- a/resource_monitor/src/resource_monitor_histograms.c
+++ b/resource_monitor/src/resource_monitor_histograms.c
@@ -1552,7 +1552,7 @@ static void show_usage(const char *cmd)
 	fprintf(stdout, "\nUse: %s [options] output_directory [workflow_name]\n\n", cmd);
 	fprintf(stdout, "\nIf -L is specified, read the summary file list from standard input.\n\n");
 	fprintf(stdout, "%-20s Enable debugging for this subsystem.\n", "-d <subsystem>");
-	fprintf(stdout, "%-20s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o <file>");
+	fprintf(stdout, "%-20s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o <file>");
 	fprintf(stdout, "%-20s Read summaries filenames from file <list>.\n", "-L <list>");
 	fprintf(stdout, "%-20s Split on task categories.\n", "-s");
 	fprintf(stdout, "%-20s Use brute force to compute proposed resource allocations. (slow)\n", "-b");
diff --git a/resource_monitor/src/rmonitor_helper.c b/resource_monitor/src/rmonitor_helper.c
index 908e69c8f5..ffbc0d66c6 100644
--- a/resource_monitor/src/rmonitor_helper.c
+++ b/resource_monitor/src/rmonitor_helper.c
@@ -59,7 +59,6 @@ static uint64_t start_time = 0;
 static uint64_t end_time   = 0;
 
 static int stop_short_running = 0; /* Stop processes that run for less than RESOURCE_MONITOR_SHORT_TIME seconds. */
-static int root_process       = 0;  /* 1 for first process to be monitored. */
 
 #define declare_original_dlsym(name) __typeof__(name) *original_ ## name;
 #define define_original_dlsym(name) original_ ## name = dlsym(RTLD_NEXT, #name);
@@ -119,13 +118,6 @@ void rmonitor_helper_initialize() {
 		family_of_fd = itable_create(8);
 	}
 
-	if(getenv(RESOURCE_MONITOR_ROOT_PROCESS)) {
-		root_process = 1;
-		unsetenv(RESOURCE_MONITOR_ROOT_PROCESS);
-	} else {
-		root_process = 0;
-	}
-
 	if(getenv(RESOURCE_MONITOR_HELPER_STOP_SHORT)) {
 		stop_short_running = 1;
 	} else {
@@ -135,6 +127,10 @@ void rmonitor_helper_initialize() {
 	initializing_helper = 0;
 }
 
+int is_root_process() {
+	const char *pid_s = getenv(RESOURCE_MONITOR_ROOT_PROCESS);
+	return (pid_s && atoi(pid_s) == getpid());
+}
 
 pid_t fork()
 {
@@ -585,7 +581,7 @@ void exit_wrapper_preamble(int status)
 	sighandler_t old_handler = signal(SIGCONT, exit_signal_handler);
 
 	int short_process = 0;
-	if(root_process) {
+	if(is_root_process()) {
 		// root process is never considered a short running process
 		short_process = 0;
 	} else if(stop_short_running) {
diff --git a/resource_monitor/src/rmonitor_helper_comm.c b/resource_monitor/src/rmonitor_helper_comm.c
index d50903ee3e..05fe4217a3 100644
--- a/resource_monitor/src/rmonitor_helper_comm.c
+++ b/resource_monitor/src/rmonitor_helper_comm.c
@@ -257,9 +257,6 @@ int rmonitor_helper_init(char *lib_default_path, int *fd, int stop_short_running
 			setenv(RESOURCE_MONITOR_HELPER_STOP_SHORT, "1", 1);
 		}
 
-		/* First process will unset this variable. */
-		setenv(RESOURCE_MONITOR_ROOT_PROCESS, "1", 1);
-
 		/* Each process sets this variable to its start time after a fork,
 		 * except for the first process, which for which we set here. */
 		char *start_time = string_format("%" PRId64, timestamp_get());
diff --git a/work_queue/src/bindings/perl/Work_Queue/Task.pm b/work_queue/src/bindings/perl/Work_Queue/Task.pm
index b5b62591c5..02d5954031 100644
--- a/work_queue/src/bindings/perl/Work_Queue/Task.pm
+++ b/work_queue/src/bindings/perl/Work_Queue/Task.pm
@@ -240,7 +240,7 @@ sub specify_priority {
 
 sub specify_environment_variable {
 	my ($self, $name, $value) = @_;
-	return work_queue_task_specify_enviroment_variable($self->{_task}, $name, $value);
+	return work_queue_task_specify_environment_variable($self->{_task}, $name, $value);
 }
 
 sub specify_monitor_output {
diff --git a/work_queue/src/bindings/python3/work_queue.binding.py b/work_queue/src/bindings/python3/work_queue.binding.py
index 8a29fd1c6f..403b350998 100644
--- a/work_queue/src/bindings/python3/work_queue.binding.py
+++ b/work_queue/src/bindings/python3/work_queue.binding.py
@@ -339,7 +339,7 @@ def specify_running_time(self, useconds):
     # Set this environment variable before running the task.
     # If value is None, then variable is unset.
     def specify_environment_variable(self, name, value=None):
-        return work_queue_task_specify_enviroment_variable(self._task, name, value)
+        return work_queue_task_specify_environment_variable(self._task, name, value)
 
     ##
     # Set a name for the resource summary output directory from the monitor.
diff --git a/work_queue/src/work_queue.c b/work_queue/src/work_queue.c
index 17e9222c4c..e86fa16842 100644
--- a/work_queue/src/work_queue.c
+++ b/work_queue/src/work_queue.c
@@ -4,12 +4,6 @@ This software is distributed under the GNU General Public License.
 See the file COPYING for details.
 */
 
-/*
-The following major problems must be fixed:
-- The capacity code assumes one task per worker.
-- The log specification need to be updated.
-*/
-
 #include "work_queue.h"
 #include "work_queue_protocol.h"
 #include "work_queue_internal.h"
@@ -736,8 +730,6 @@ static int get_transfer_wait_time(struct work_queue *q, struct work_queue_worker
 		avg_transfer_rate = get_queue_transfer_rate(q, &data_source);
 	}
 
-	debug(D_WQ,"%s (%s) using %s average transfer rate of %.2lf MB/s\n", w->hostname, w->addrport, data_source, avg_transfer_rate/MEGABYTE);
-
 	double tolerable_transfer_rate = avg_transfer_rate / q->transfer_outlier_factor; // bytes per second
 
 	int timeout = length / tolerable_transfer_rate;
@@ -750,7 +742,13 @@ static int get_transfer_wait_time(struct work_queue *q, struct work_queue_worker
 		timeout = MAX(q->minimum_transfer_timeout,timeout);
 	}
 
-	debug(D_WQ, "%s (%s) will try up to %d seconds to transfer this %.2lf MB file.", w->hostname, w->addrport, timeout, length/1000000.0);
+	/* Don't bother printing anything for transfers of less than 1MB, to avoid excessive output. */
+
+	if( length >= 1048576 ) {
+		debug(D_WQ,"%s (%s) using %s average transfer rate of %.2lf MB/s\n", w->hostname, w->addrport, data_source, avg_transfer_rate/MEGABYTE);
+
+		debug(D_WQ, "%s (%s) will try up to %d seconds to transfer this %.2lf MB file.", w->hostname, w->addrport, timeout, length/1000000.0);
+	}
 
 	free(data_source);
 	return timeout;
@@ -1853,6 +1851,9 @@ static work_queue_result_code_t get_result(struct work_queue *q, struct work_que
 	}
 
 	if(task_status == WORK_QUEUE_RESULT_FORSAKEN) {
+		// Delete any input files that are not to be cached.
+		delete_worker_files(q, w, t->input_files, WORK_QUEUE_CACHE | WORK_QUEUE_PREEXIST);
+
 		/* task will be resubmitted, so we do not update any of the execution stats */
 		reap_task_from_worker(q, w, t, WORK_QUEUE_TASK_READY);
 
@@ -2782,47 +2783,60 @@ static int build_poll_table(struct work_queue *q, struct link *master)
 	return n;
 }
 
-static int send_file( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *localname, const char *remotename, off_t offset, int64_t length, int64_t *total_bytes, int flags)
+/*
+Send a symbolic link to the remote worker.
+Note that the target of the link is sent
+as sthe "body" of the link, following the
+message header.
+*/
+
+static int send_symlink( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *localname, const char *remotename, int64_t *total_bytes )
+{
+	char target[WORK_QUEUE_LINE_MAX];
+
+	int length = readlink(localname,target,sizeof(target));
+	if(length<0) return APP_FAILURE;
+
+	char remotename_encoded[WORK_QUEUE_LINE_MAX];
+	url_encode(remotename,remotename_encoded,sizeof(remotename_encoded));
+
+	send_worker_msg(q,w,"symlink %s %d\n",remotename_encoded,length);
+
+	link_write(w->link,target,length,time(0)+q->long_timeout);
+
+	*total_bytes += length;
+
+	return SUCCESS;
+}
+
+/*
+Send a single file (or a piece of a file) to the remote worker.
+The transfer time is controlled by the size of the file.
+If the transfer takes too long, then abort.
+*/
+
+static int send_file( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *localname, const char *remotename, off_t offset, int64_t length, struct stat info, int64_t *total_bytes )
 {
-	struct stat local_info;
 	time_t stoptime;
 	timestamp_t effective_stoptime = 0;
 	int64_t actual = 0;
 
-	if(stat(localname, &local_info) < 0) {
-		if(lstat(localname,&local_info)==0) {
-			/*
-			If stat fails but lstat succeeds, we are looking at
-			a broken symbolic link.  This could be user error but
-			is more frequently an editor lock file or similar indication.
-			In this case, emit a warning but continue without sending
-			the file.
-			*/
-			debug(D_WQ|D_NOTICE,"skipping broken symbolic link: %s",localname);
-			return SUCCESS;
-		}
-
-		debug(D_NOTICE, "Cannot stat file %s: %s", localname, strerror(errno));
-		return APP_FAILURE;
-	}
-
 	/* normalize the mode so as not to set up invalid permissions */
-	local_info.st_mode |= 0600;
-	local_info.st_mode &= 0777;
+	int mode = ( info.st_mode | 0x600 ) & 0777;
 
 	if(!length) {
-		length = local_info.st_size;
+		length = info.st_size;
 	}
 
-	debug(D_WQ, "%s (%s) needs file %s bytes %lld:%lld as '%s'", w->hostname, w->addrport, localname, (long long) offset, (long long) offset+length, remotename);
 	int fd = open(localname, O_RDONLY, 0);
 	if(fd < 0) {
 		debug(D_NOTICE, "Cannot open file %s: %s", localname, strerror(errno));
 		return APP_FAILURE;
 	}
 
-	//We want to send bytes starting from 'offset'. So seek to it first.
-	if (offset >= 0 && (offset+length) <= local_info.st_size) {
+	/* If we are sending only a piece of the file, seek there first. */
+
+	if (offset >= 0 && (offset+length) <= info.st_size) {
 		if(lseek(fd, offset, SEEK_SET) == -1) {
 			debug(D_NOTICE, "Cannot seek file %s to offset %lld: %s", localname, (long long) offset, strerror(errno));
 			close(fd);
@@ -2838,15 +2852,18 @@ static int send_file( struct work_queue *q, struct work_queue_worker *w, struct
 		effective_stoptime = (length/q->bandwidth)*1000000 + timestamp_get();
 	}
 
+	/* filenames are url-encoded to avoid problems with spaces, etc */
+	char remotename_encoded[WORK_QUEUE_LINE_MAX];
+	url_encode(remotename,remotename_encoded,sizeof(remotename_encoded));
+
 	stoptime = time(0) + get_transfer_wait_time(q, w, t, length);
-	send_worker_msg(q,w, "put %s %"PRId64" 0%o %d\n",remotename, length, local_info.st_mode, flags);
+	send_worker_msg(q,w, "put %s %"PRId64" 0%o\n",remotename_encoded, length, mode );
 	actual = link_stream_from_fd(w->link, fd, length, stoptime);
 	close(fd);
 
 	*total_bytes += actual;
 
-	if(actual != length)
-		return WORKER_FAILURE;
+	if(actual != length) return WORKER_FAILURE;
 
 	timestamp_t current_time = timestamp_get();
 	if(effective_stoptime && effective_stoptime > current_time) {
@@ -2856,98 +2873,138 @@ static int send_file( struct work_queue *q, struct work_queue_worker *w, struct
 	return SUCCESS;
 }
 
+/* Need prototype here to address mutually recursive code. */
+
+static work_queue_result_code_t send_item( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *name, const char *remotename, int64_t offset, int64_t length, int64_t * total_bytes, int follow_links );
+
 /*
-Send a directory and all of its contentss.
+Send a directory and all of its contents using the new streaming protocol.
+Do this by sending a "dir" prefix, then all of the directory contents,
+and then an "end" marker.
 */
-static work_queue_result_code_t send_directory( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *dirname, const char *remotedirname, int64_t * total_bytes, int flags )
+
+static work_queue_result_code_t send_directory( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *localname, const char *remotename, int64_t * total_bytes )
 {
-	DIR *dir = opendir(dirname);
+	DIR *dir = opendir(localname);
 	if(!dir) {
-		debug(D_NOTICE, "Cannot open dir %s: %s", dirname, strerror(errno));
+		debug(D_NOTICE, "Cannot open dir %s: %s", localname, strerror(errno));
 		return APP_FAILURE;
 	}
 
 	work_queue_result_code_t result = SUCCESS;
 
-	// When putting a file its parent directories are automatically
-	// created by the worker, so no need to manually create them.
+	char remotename_encoded[WORK_QUEUE_LINE_MAX];
+	url_encode(remotename,remotename_encoded,sizeof(remotename_encoded));
+
+	send_worker_msg(q,w,"dir %s\n",remotename_encoded);
+
 	struct dirent *d;
 	while((d = readdir(dir))) {
 		if(!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue;
 
-		char *localpath = string_format("%s/%s",dirname,d->d_name);
-		char *remotepath = string_format("%s/%s",remotedirname,d->d_name);
+		char *localpath = string_format("%s/%s",localname,d->d_name);
 
-		struct stat local_info;
-		if(lstat(localpath, &local_info)>=0) {
-			if(S_ISDIR(local_info.st_mode))  {
-				result = send_directory( q, w, t, localpath, remotepath, total_bytes, flags );
-			} else {
-				result = send_file( q, w, t, localpath, remotepath, 0, 0, total_bytes, flags );
-			}
-		} else {
-			debug(D_NOTICE, "Cannot stat file %s: %s", localpath, strerror(errno));
-			result = APP_FAILURE;
-		}
+		result = send_item( q, w, t, localpath, d->d_name, 0, 0, total_bytes, 0 );
 
 		free(localpath);
-		free(remotepath);
 
 		if(result != SUCCESS) break;
 	}
 
+	send_worker_msg(q,w,"end\n");
+
 	closedir(dir);
 	return result;
 }
 
 /*
-Send a file or directory to a remote worker, if it is not already cached.
+Send a single item, whether it is a directory, symlink, or file.
+
+Note 1: We call stat/lstat here a single time, and then pass it
+to the underlying object so as not to minimize syscall work.
+
+Note 2: This function is invoked at the top level with follow_links=1,
+since it is common for the user to to pass in a top-level symbolic
+link to a file or directory which they want transferred.
+However, in recursive calls, follow_links is set to zero,
+and internal links are not followed, they are sent natively.
+*/
+
+
+static work_queue_result_code_t send_item( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, const char *localpath, const char *remotepath, int64_t offset, int64_t length, int64_t * total_bytes, int follow_links )
+{
+	struct stat info;
+	int result = SUCCESS;
+
+	if(follow_links) {
+		result = stat(localpath,&info);
+	} else {
+		result = lstat(localpath,&info);
+	}
+
+	if(result>=0) {
+		if(S_ISDIR(info.st_mode))  {
+			result = send_directory( q, w, t, localpath, remotepath, total_bytes );
+		} else if(S_ISLNK(info.st_mode)) {
+			result = send_symlink( q, w, t, localpath, remotepath, total_bytes );
+		} else if(S_ISREG(info.st_mode)) {
+			result = send_file( q, w, t, localpath, remotepath, offset, length, info, total_bytes );
+		} else {
+			debug(D_NOTICE,"skipping unusual file: %s",strerror(errno));
+		}
+	} else {
+		debug(D_NOTICE, "cannot stat file %s: %s", localpath, strerror(errno));
+		result = APP_FAILURE;
+	}
+
+	return result;
+}
+
+/*
+Send an item to a remote worker, if it is not already cached.
 The local file name should already have been expanded by the caller.
+If it is in the worker, but a new version is available, warn and return.
+We do not want to rewrite the file while some other task may be using it.
+Otherwise, send it to the worker.
 */
-static work_queue_result_code_t send_file_or_directory( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, struct work_queue_file *tf, const char *expanded_local_name, int64_t * total_bytes)
+
+static work_queue_result_code_t send_item_if_not_cached( struct work_queue *q, struct work_queue_worker *w, struct work_queue_task *t, struct work_queue_file *tf, const char *expanded_local_name, int64_t * total_bytes)
 {
 	struct stat local_info;
-	struct stat *remote_info;
-
 	if(lstat(expanded_local_name, &local_info) < 0) {
 		debug(D_NOTICE, "Cannot stat file %s: %s", expanded_local_name, strerror(errno));
 		return APP_FAILURE;
 	}
 
-	work_queue_result_code_t result = SUCCESS;
-
-	// Look in the current files hash to see if the file is already on the worker.
-	remote_info = hash_table_lookup(w->current_files, tf->cached_name);
+	struct stat *remote_info = hash_table_lookup(w->current_files, tf->cached_name);
 
-	/* If it is in the worker, but a new version is available, warn and return.
-	   We do not want to rewrite the file while some other task may be using
-	   it. */
 	if(remote_info && (remote_info->st_mtime != local_info.st_mtime || remote_info->st_size != local_info.st_size)) {
 		debug(D_NOTICE|D_WQ, "File %s changed locally. Task %d will be executed with an older version.", expanded_local_name, t->taskid);
-	}
-	else if(!remote_info) {
-		/* If not on the worker, send it. */
-		if(S_ISDIR(local_info.st_mode)) {
-			result = send_directory(q, w, t, expanded_local_name, tf->cached_name, total_bytes, tf->flags);
+		return SUCCESS;
+	} else if(!remote_info) {
+
+		if(tf->offset==0 && tf->length==0) {
+			debug(D_WQ, "%s (%s) needs file %s as '%s'", w->hostname, w->addrport, expanded_local_name, tf->cached_name);
 		} else {
-			result = send_file(q, w, t, expanded_local_name, tf->cached_name, tf->offset, tf->piece_length, total_bytes, tf->flags);
+		  debug(D_WQ, "%s (%s) needs file %s (offset %lld length %lld) as '%s'", w->hostname, w->addrport, expanded_local_name, (long long) tf->offset, (long long) tf->length, tf->cached_name );
 		}
 
+		work_queue_result_code_t result;
+		result = send_item(q, w, t, expanded_local_name, tf->cached_name, tf->offset, tf->piece_length, total_bytes, 1 );
+
 		if(result == SUCCESS && tf->flags & WORK_QUEUE_CACHE) {
-			remote_info = malloc(sizeof(*remote_info));
+			remote_info = xxmalloc(sizeof(*remote_info));
 			if(remote_info) {
 				memcpy(remote_info, &local_info, sizeof(local_info));
 				hash_table_insert(w->current_files, tf->cached_name, remote_info);
-			} else {
-				debug(D_NOTICE, "Cannot allocate memory for cache entry for input file %s at %s (%s)", expanded_local_name, w->hostname, w->addrport);
 			}
 		}
-	}
-	else {
+
+		return result;
+	} else {
 		/* Up-to-date file on the worker, we do nothing. */
+		return SUCCESS;
 	}
-
-	return result;
 }
 
 /**
@@ -3035,7 +3092,7 @@ static work_queue_result_code_t send_input_file(struct work_queue *q, struct wor
 	case WORK_QUEUE_BUFFER:
 		debug(D_WQ, "%s (%s) needs literal as %s", w->hostname, w->addrport, f->remote_name);
 		time_t stoptime = time(0) + get_transfer_wait_time(q, w, t, f->length);
-		send_worker_msg(q,w, "put %s %d %o %d\n",f->cached_name, f->length, 0777, f->flags);
+		send_worker_msg(q,w, "put %s %d %o\n",f->cached_name, f->length, 0777 );
 		actual = link_putlstring(w->link, f->payload, f->length, stoptime);
 		if(actual!=f->length) {
 			result = WORKER_FAILURE;
@@ -3075,7 +3132,7 @@ static work_queue_result_code_t send_input_file(struct work_queue *q, struct wor
 		} else {
 			char *expanded_payload = expand_envnames(w, f->payload);
 			if(expanded_payload) {
-				result = send_file_or_directory(q,w,t,f,expanded_payload,&total_bytes);
+				result = send_item_if_not_cached(q,w,t,f,expanded_payload,&total_bytes);
 				free(expanded_payload);
 			} else {
 				result = APP_FAILURE; //signal app-level failure.
@@ -3269,7 +3326,7 @@ static work_queue_result_code_t start_one_task(struct work_queue *q, struct work
 	// send_worker_msg returns the number of bytes sent, or a number less than
 	// zero to indicate errors. We are lazy here, we only check the last
 	// message we sent to the worker (other messages may have failed above).
-	int result_msg = send_worker_msg(q,w, "end\n");
+	int result_msg = send_worker_msg(q,w,"end\n");
 
 	if(result_msg > -1)
 	{
@@ -4191,7 +4248,7 @@ void work_queue_task_specify_command( struct work_queue_task *t, const char *cmd
 	t->command_line = xxstrdup(cmd);
 }
 
-void work_queue_task_specify_enviroment_variable( struct work_queue_task *t, const char *name, const char *value )
+void work_queue_task_specify_environment_variable( struct work_queue_task *t, const char *name, const char *value )
 {
 	if(value) {
 		list_push_tail(t->env_list,string_format("%s=%s",name,value));
@@ -4201,6 +4258,11 @@ void work_queue_task_specify_enviroment_variable( struct work_queue_task *t, con
 	}
 }
 
+/* same as above, but with a typo. can't remove as it is part of already published api. */
+void work_queue_task_specify_enviroment_variable( struct work_queue_task *t, const char *name, const char *value ) {
+	work_queue_task_specify_environment_variable(t, name, value);
+}
+
 void work_queue_task_specify_max_retries( struct work_queue_task *t, int64_t max_retries ) {
 	if(max_retries < 1) {
 		t->max_retries = 0;
@@ -4974,7 +5036,7 @@ struct work_queue *work_queue_create(int port)
 	q->asynchrony_multiplier = 1.0;
 	q->asynchrony_modifier = 0;
 
-	q->minimum_transfer_timeout = 10;
+	q->minimum_transfer_timeout = 60;
 	q->foreman_transfer_timeout = 3600;
 	q->transfer_outlier_factor = 10;
 	q->default_transfer_rate = 1*MEGABYTE;
diff --git a/work_queue/src/work_queue.h b/work_queue/src/work_queue.h
index 6f12b3767e..79fe70a51c 100644
--- a/work_queue/src/work_queue.h
+++ b/work_queue/src/work_queue.h
@@ -495,7 +495,7 @@ Specify an environment variable to be added to the task.
 @param name Name of the variable.
 @param value Value of the variable.
  */
-void work_queue_task_specify_enviroment_variable( struct work_queue_task *t, const char *name, const char *value );
+void work_queue_task_specify_environment_variable( struct work_queue_task *t, const char *name, const char *value );
 
 /** Select the scheduling algorithm for a single task.
 To change the scheduling algorithm for all tasks, use @ref work_queue_specify_algorithm instead.
@@ -1098,6 +1098,11 @@ int work_queue_task_specify_output_file_do_not_cache(struct work_queue_task *t,
 */
 char *work_queue_generate_disk_alloc_full_filename(char *pwd, int taskid);
 
+
+/** Same as work_queue_task_specify_environment_variable, but with a typo in environment
+ */
+void work_queue_task_specify_enviroment_variable( struct work_queue_task *t, const char *name, const char *value );
+
 //@}
 
 #endif
diff --git a/work_queue/src/work_queue_graph_log b/work_queue/src/work_queue_graph_log
index 3fd9003ac3..ff35278337 100755
--- a/work_queue/src/work_queue_graph_log
+++ b/work_queue/src/work_queue_graph_log
@@ -8,7 +8,8 @@ import sys
 import re
 import os
 import getopt
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, check_output
+from functools import reduce
 
 gnuplot_cmd   = 'gnuplot'
 format        = 'svg'
@@ -44,7 +45,7 @@ def time_field_p(field):
 def read_log_entries(file, fields):
     log_entries = {}
     idxs  = range(0, len(fields))
-    pairs = zip(idxs, fields)
+    pairs = list(zip(idxs, fields))
     epoch = None
     count_lines = 0
     prev_line = None
@@ -124,8 +125,7 @@ def sort_time(log_entries):
     return times
 
 def pout(file, str):
-    file.write(str)
-    file.write('\n')
+    file.write("{}\n".format(str).encode('utf-8'))
 
 class WQPlot:
     def __init__(self, title, ylabel, fields, labels=None, x_units = x_units, y_units = x_units, range = x_range, stack = False):
@@ -234,10 +234,8 @@ class WQPlotLog(WQPlot):
 
 def check_gnuplot_version(gnuplot_cmd):
         try:
-            gnuplot = Popen([gnuplot_cmd, '--version'], stdout = PIPE)
-            version = gnuplot.stdout.readline()
-            gnuplot.stdout.close()
-
+            version = check_output([gnuplot_cmd, '--version'])
+            version = version.decode("utf-8")
             result = re.match('gnuplot\s+(\d+\.\d+)\D', version)
 
             if not result:
@@ -255,20 +253,29 @@ def check_gnuplot_version(gnuplot_cmd):
             exit(1)
 
 def show_usage():
-    print '\n%s [options] <work-queue-log>\n' % (os.path.basename(sys.argv[0],))
-    print '\t-h\t\t\tThis message.'
-    print '\t-c <gnuplot-path>\tSpecify the location of the gnuplot executable.'
-    print '\t\t\t\tDefault is gnuplot.'
-    print '\t-o <prefix-output>\tGenerate prefix-output.{workers,workers-accum,tasks,tasks-accum,time-master,time-workers,transfer,cores}.%s.' % (format,)
-    print '\t\t\t\tDefault is <work-queue-log>.\n'
-    print '\t-r <range>\t\tRange of time to plot, in time units (see -u) from'
-    print '\t\t\t\tthe start of execution. Of the form: min:max, min:, or :max.'
-    print '\t-s <seconds>\t\tSample log every <seconds> (default is %f).' % (resolution,)
-    print '\t-u <time-unit>\t\tTime scale to output. One of s,m,h or d, for seconds,'
-    print '\t\t\t\tminutes (default), hours or days.\n'
-    print '\t-T <output-format>\tSet output format. Default is %s.' % (format,)
-    print '\t\t\t\tIf \'text\', then the gnuplot scripts are written instead of the images.'
-    print '\t-g <width,height>\tSize of each plot. Default is %s.\n' % (geometry,)
+    usage_string = """
+{command} [options] <work-queue-log>
+        -h                  This message.
+        -c <gnuplot-path>   Specify the location of the gnuplot executable.
+                            Default is gnuplot.
+        -o <prefix-output>  Generate prefix-output.{{workers,workers-accum,
+                                                    tasks,tasks-accum,
+                                                    time-master,time-workers,
+                                                    transfer,cores}}.{format}
+                            Default is <work-queue-log>.
+        -r <range>          Range of time to plot, in time units (see -u) from
+                            the start of execution. Of the form: min:max,
+                            min:, or :max.
+        -s <seconds>        Sample log every <seconds> (default is {format}).
+        -u <time-unit>      Time scale to output. One of s,m,h or d, for seconds,
+                            minutes (default), hours or days.
+        -T <output-format>  Set output format. Default is {format}.
+                            If \'text\', then the gnuplot scripts are written
+                            instead of the images.
+        -g <width,height>   Size of each plot. Default is {geometry}.
+""".format(command=os.path.basename(sys.argv[0],), format=format, resolution=resolution, geometry=geometry)
+    print(usage_string)
+
 
 if __name__ == '__main__':
 
diff --git a/work_queue/src/work_queue_json.c b/work_queue/src/work_queue_json.c
index af18b9c89f..24158964f2 100644
--- a/work_queue/src/work_queue_json.c
+++ b/work_queue/src/work_queue_json.c
@@ -163,7 +163,7 @@ static int specify_environment(struct jx *environment, struct work_queue_task *t
 	struct jx *value = jx_iterate_values(environment, &i);
 
     while(key != NULL) {
-        work_queue_task_specify_enviroment_variable(task, key, value->u.string_value);
+        work_queue_task_specify_environment_variable(task, key, value->u.string_value);
         key = jx_iterate_keys(environment, &j);
         value = jx_iterate_values(environment, &i);
     }
diff --git a/work_queue/src/work_queue_process.c b/work_queue/src/work_queue_process.c
index 72a5ed5bc0..96c09660df 100644
--- a/work_queue/src/work_queue_process.c
+++ b/work_queue/src/work_queue_process.c
@@ -173,7 +173,7 @@ static void export_environment( struct work_queue_process *p )
 
 static void specify_integer_env_var( struct work_queue_process *p, const char *name, int64_t value) {
 	char *value_str = string_format("%" PRId64, value);
-	work_queue_task_specify_enviroment_variable(p->task, name, value_str);
+	work_queue_task_specify_environment_variable(p->task, name, value_str);
 	free(value_str);
 }
 
diff --git a/work_queue/src/work_queue_protocol.h b/work_queue/src/work_queue_protocol.h
index 8b0e11f1b0..dac3877bd8 100644
--- a/work_queue/src/work_queue_protocol.h
+++ b/work_queue/src/work_queue_protocol.h
@@ -19,7 +19,8 @@ This file should not be installed and should only be included by .c files.
 /* 6: worker only report total, max, and min resources. */
 /* 7: added category message */
 /* 8: worker send feature message. */
-#define WORK_QUEUE_PROTOCOL_VERSION 8
+/* 9: recursive send/recv and filename encoding. */
+#define WORK_QUEUE_PROTOCOL_VERSION 9
 
 #define WORK_QUEUE_LINE_MAX 4096       /**< Maximum length of a work queue message line. */
 #define WORK_QUEUE_POOL_NAME_MAX 128   /**< Maximum length of a work queue pool name. */
diff --git a/work_queue/src/work_queue_status.c b/work_queue/src/work_queue_status.c
index 513f5a7cc8..42ace266eb 100644
--- a/work_queue/src/work_queue_status.c
+++ b/work_queue/src/work_queue_status.c
@@ -130,7 +130,7 @@ static void show_help(const char *progname)
 	fprintf(stdout, " %-30s Filter results by this expression.\n", "   --where=<expr>");
 	fprintf(stdout, " %-30s RPC timeout (default is %ds).\n", "-t,--timeout=<time>", work_queue_status_timeout);
 	fprintf(stdout, " %-30s Send debugging to this file. (can also be :stderr,\n", "-o,--debug-file=<file>");
-	fprintf(stdout, " %-30s :stdout, :syslog, or :journal)\n", "");
+	fprintf(stdout, " %-30s or :stdout)\n", "");
 	fprintf(stdout, " %-30s Rotate debug file once it reaches this size.\n", "-O,--debug-rotate-max=<bytes>");
 	fprintf(stdout, " %-30s Show work_queue_status version.\n", "-v,--version");
 	fprintf(stdout, " %-30s This message.\n", "-h,--help");
diff --git a/work_queue/src/work_queue_worker.c b/work_queue/src/work_queue_worker.c
index 7231fbcf8b..e9d2f9c88f 100644
--- a/work_queue/src/work_queue_worker.c
+++ b/work_queue/src/work_queue_worker.c
@@ -462,7 +462,7 @@ int link_recursive( const char *source, const char *target )
 {
 	struct stat info;
 
-	if(stat(source,&info)<0) return 0;
+	if(lstat(source,&info)<0) return 0;
 
 	if(S_ISDIR(info.st_mode)) {
 		DIR *dir = opendir(source);
@@ -726,7 +726,7 @@ static int handle_tasks(struct link *master)
 }
 
 /**
- * Stream file/directory contents for the rget protocol.
+ * Stream file/directory contents for the recursive get/put protocol.
  * Format:
  * 		for a directory: a new line in the format of "dir $DIR_NAME 0"
  * 		for a file: a new line in the format of "file $FILE_NAME $FILE_LENGTH"
@@ -760,6 +760,7 @@ static int handle_tasks(struct link *master)
  * end
  *
  */
+
 static int stream_output_item(struct link *master, const char *filename, int recursive)
 {
 	DIR *dir;
@@ -797,7 +798,7 @@ static int stream_output_item(struct link *master, const char *filename, int rec
 		fd = open(cached_filename, O_RDONLY, 0);
 		if(fd >= 0) {
 			length = info.st_size;
-			send_master_message(master, "file %s %"PRId64"\n", filename, length);
+			send_master_message(master, "file %s %"PRId64"\n", filename, length );
 			actual = link_stream_from_fd(master, fd, length, time(0) + active_timeout);
 			close(fd);
 			if(actual != length) {
@@ -948,7 +949,7 @@ static int do_task( struct link *master, int taskid, time_t stoptime )
 			if(value) {
 				*value = 0;
 				value++;
-				work_queue_task_specify_enviroment_variable(task,env,value);
+				work_queue_task_specify_environment_variable(task,env,value);
 			}
 			free(env);
 		} else {
@@ -988,51 +989,73 @@ static int do_task( struct link *master, int taskid, time_t stoptime )
 }
 
 /*
-Handle an incoming "put" message from the master,
-which places a file into the cache directory.
+Return false if name is invalid as a simple filename.
+For example, if it contains a slash, which would escape
+the current working directory.
 */
 
-static int do_put( struct link *master, char *filename, int64_t length, int mode )
+int is_valid_filename( const char *name )
 {
-	char cached_filename[WORK_QUEUE_LINE_MAX];
-	char *cur_pos;
+	if(strchr(name,'/')) return 0;
+	return 1;
+}
 
-	debug(D_WQ, "Putting file %s into workspace\n", filename);
-	if(!check_disk_space_for_filesize(".", length, disk_avail_threshold)) {
-		debug(D_WQ, "Could not put file %s, not enough disk space (%"PRId64" bytes needed)\n", filename, length);
+/*
+Handle an incoming symbolic link inside the rput protocol.
+The filename of the symlink was already given in the message,
+and the target of the symlink is given as the "body" which
+must be read off of the wire.  The symlink target does not
+need to be url_decoded because it is sent in the body.
+*/
+
+static int do_put_symlink_internal( struct link *master, char *filename, int length )
+{
+	char *target = malloc(length);
+
+	int actual = link_read(master,target,length,time(0)+active_timeout);
+	if(actual!=length) {
+		free(target);
 		return 0;
 	}
 
+	int result = symlink(target,filename);
+	if(result<0) {
+		debug(D_WQ,"could not create symlink %s: %s",filename,strerror(errno));
+		free(target);
+		return 0;
+	}
 
-	mode = mode | 0600;
-
-	cur_pos = filename;
+	free(target);
 
-	while(!strncmp(cur_pos, "./", 2)) {
-		cur_pos += 2;
-	}
+	return 1;
+}
 
-	string_nformat(cached_filename, sizeof(cached_filename), "cache/%s", cur_pos);
+/*
+Handle an incoming file inside the rput protocol.
+Notice that we trust the caller to have created
+the necessary parent directories and checked the
+name for validity.
+*/
 
-	cur_pos = strrchr(cached_filename, '/');
-	if(cur_pos) {
-		*cur_pos = '\0';
-		if(!create_dir(cached_filename, mode | 0700)) {
-			debug(D_WQ, "Could not create directory - %s (%s)\n", cached_filename, strerror(errno));
-			return 0;
-		}
-		*cur_pos = '/';
+static int do_put_file_internal( struct link *master, char *filename, int64_t length, int mode )
+{
+	if(!check_disk_space_for_filesize(".", length, disk_avail_threshold)) {
+		debug(D_WQ, "Could not put file %s, not enough disk space (%"PRId64" bytes needed)\n", filename, length);
+		return 0;
 	}
 
-	int fd = open(cached_filename, O_WRONLY | O_CREAT | O_TRUNC, mode);
-	if(fd < 0) {
+	/* Ensure that worker can access the file! */
+	mode = mode | 0600;
+
+	int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, mode);
+	if(fd<0) {
 		debug(D_WQ, "Could not open %s for writing. (%s)\n", filename, strerror(errno));
 		return 0;
 	}
 
 	int64_t actual = link_stream_to_fd(master, fd, length, time(0) + active_timeout);
 	close(fd);
-	if(actual != length) {
+	if(actual!=length) {
 		debug(D_WQ, "Failed to put file - %s (%s)\n", filename, strerror(errno));
 		return 0;
 	}
@@ -1040,6 +1063,117 @@ static int do_put( struct link *master, char *filename, int64_t length, int mode
 	return 1;
 }
 
+/*
+Handle an incoming directory inside the recursive dir protocol.
+Notice that we have already checked the dirname for validity,
+and now we process "put" and "dir" commands within the list
+until "end" is reached.  Note that "put" is used instead of
+"file" for historical reasons, to support recursive reuse
+of existing code.
+*/
+
+static int do_put_dir_internal( struct link *master, char *dirname )
+{
+	char line[WORK_QUEUE_LINE_MAX];
+	char name_encoded[WORK_QUEUE_LINE_MAX];
+	char name[WORK_QUEUE_LINE_MAX];
+	int64_t size;
+	int mode;
+
+	int result = mkdir(dirname,0777);
+	if(result<0) {
+		debug(D_WQ,"unable to create %s: %s",dirname,strerror(errno));
+		return 0;
+	}
+
+	while(1) {
+		if(!recv_master_message(master,line,sizeof(line),time(0)+active_timeout)) return 0;
+
+		int r = 0;
+
+		if(sscanf(line,"put %s %" SCNd64 " %o",name_encoded,&size,&mode)==3) {
+
+			url_decode(name_encoded,name,sizeof(name));
+			if(!is_valid_filename(name)) return 0;
+
+			char *subname = string_format("%s/%s",dirname,name);
+			r = do_put_file_internal(master,subname,size,mode);
+			free(subname);
+
+		} else if(sscanf(line,"symlink %s %" SCNd64,name_encoded,&size)==2) {
+
+			url_decode(name_encoded,name,sizeof(name));
+			if(!is_valid_filename(name)) return 0;
+
+			char *subname = string_format("%s/%s",dirname,name);
+			r = do_put_symlink_internal(master,subname,size);
+			free(subname);
+
+		} else if(sscanf(line,"dir %s",name_encoded)==1) {
+
+			url_decode(name_encoded,name,sizeof(name));
+			if(!is_valid_filename(name)) return 0;
+
+			char *subname = string_format("%s/%s",dirname,name);
+			r = do_put_dir_internal(master,subname);
+			free(subname);
+
+		} else if(!strcmp(line,"end")) {
+			break;
+		}
+
+		if(!r) return 0;
+	}
+
+	return 1;
+}
+
+static int do_put_dir( struct link *master, char *dirname )
+{
+	if(!is_valid_filename(dirname)) return 0;
+
+	char * cachename = string_format("cache/%s",dirname);
+	int result = do_put_dir_internal(master,cachename);
+	free(cachename);
+
+	return result;
+}
+
+/*
+This is the old method for sending a single file.
+It works, but it has the deficiency that the master
+expects the worker to create all parent directories
+for the file, which is horrifically expensive when
+sending a large directory tree.  The direction put
+protocol (above) is preferred instead.
+*/
+
+static int do_put_single_file( struct link *master, char *filename, int64_t length, int mode )
+{
+	if(!path_within_dir(filename, workspace)) {
+		debug(D_WQ, "Path - %s is not within workspace %s.", filename, workspace);
+		return 0;
+	}
+
+	char * cached_filename = string_format("cache/%s",filename);
+
+	if(strchr(filename,'/')) {
+		char dirname[WORK_QUEUE_LINE_MAX];
+		path_dirname(filename,dirname);
+		if(!create_dir(dirname,0777)) {
+			debug(D_WQ, "could not create directory %s: %s",dirname,strerror(errno));
+			free(cached_filename);
+			return 0;
+		}
+	}
+
+	int result = do_put_file_internal(master,cached_filename,length,mode);
+
+	free(cached_filename);
+
+	return result;
+}
+
 static int file_from_url(const char *url, const char *filename) {
 
 		debug(D_WQ, "Retrieving %s from (%s)\n", filename, url);
@@ -1067,9 +1201,16 @@ static int do_url(struct link* master, const char *filename, int length, int mod
 		return file_from_url(url, cache_name);
 }
 
-static int do_unlink(const char *path) {
+static int do_unlink(const char *path)
+{
 	char cached_path[WORK_QUEUE_LINE_MAX];
 	string_nformat(cached_path, sizeof(cached_path), "cache/%s", path);
+
+	if(!path_within_dir(cached_path, workspace)) {
+		debug(D_WQ, "%s is not within workspace %s",cached_path,workspace);
+		return 0;
+	}
+
 	//Use delete_dir() since it calls unlink() if path is a file.
 	if(delete_dir(cached_path) != 0) {
 		struct stat buf;
@@ -1416,6 +1557,7 @@ static void disconnect_master(struct link *master) {
 
 static int handle_master(struct link *master) {
 	char line[WORK_QUEUE_LINE_MAX];
+	char filename_encoded[WORK_QUEUE_LINE_MAX];
 	char filename[WORK_QUEUE_LINE_MAX];
 	char path[WORK_QUEUE_LINE_MAX];
 	int64_t length;
@@ -1425,40 +1567,28 @@ static int handle_master(struct link *master) {
 	if(recv_master_message(master, line, sizeof(line), idle_stoptime )) {
 		if(sscanf(line,"task %" SCNd64, &taskid)==1) {
 			r = do_task(master, taskid,time(0)+active_timeout);
-		} else if(string_prefix_is(line, "put ")) {
-			char *f = NULL, *l = NULL, *m = NULL, *g = NULL;
-			if(pattern_match(line, "^put (.+) (%d+) ([0-7]+) (%d+)$", &f, &l, &m, &g) >= 0) {
-				strncpy(filename, f, WORK_QUEUE_LINE_MAX); free(f);
-				length = strtoll(l, 0, 10); free(l);
-				mode   = strtol(m, NULL, 8); free(m);
-				free(g); //flags are not used anymore.
-				
-				if(path_within_dir(filename, workspace)) {
-					r = do_put(master, filename, length, mode);
-					reset_idle_timer();
-				} else {
-					debug(D_WQ, "Path - %s is not within workspace %s.", filename, workspace);
-					r = 0;
-				}
-			} else {
-				debug(D_WQ, "Malformed put message.");
-				r = 0;
-			}
+		} else if(sscanf(line,"put %s %"SCNd64" %o",filename_encoded,&length,&mode)==3) {
+			url_decode(filename_encoded,filename,sizeof(filename));
+			r = do_put_single_file(master, filename, length, mode);
+			reset_idle_timer();
+		} else if(sscanf(line, "dir %s", filename_encoded)==1) {
+			url_decode(filename_encoded,filename,sizeof(filename));
+			r = do_put_dir(master,filename);
+			reset_idle_timer();
 		} else if(sscanf(line, "url %s %" SCNd64 " %o", filename, &length, &mode) == 3) {
 			r = do_url(master, filename, length, mode);
 			reset_idle_timer();
-		} else if(sscanf(line, "unlink %s", filename) == 1) {
-			if(path_within_dir(filename, workspace)) {
-				r = do_unlink(filename);
-			} else {
-				debug(D_WQ, "Path - %s is not within workspace %s.", filename, workspace);
-				r= 0;
-			}
-		} else if(sscanf(line, "get %s %d", filename, &mode) == 2) {
+		} else if(sscanf(line, "unlink %s", filename_encoded) == 1) {
+			url_decode(filename_encoded,filename,sizeof(filename));
+			r = do_unlink(filename);
+		} else if(sscanf(line, "get %s %d", filename_encoded, &mode) == 2) {
+			url_decode(filename_encoded,filename,sizeof(filename));
 			r = do_get(master, filename, mode);
-		} else if(sscanf(line, "thirdget %o %s %[^\n]", &mode, filename, path) == 3) {
+		} else if(sscanf(line, "thirdget %o %s %[^\n]", &mode, filename_encoded, path) == 3) {
+			url_decode(filename_encoded,filename,sizeof(filename));
 			r = do_thirdget(mode, filename, path);
-		} else if(sscanf(line, "thirdput %o %s %[^\n]", &mode, filename, path) == 3) {
+		} else if(sscanf(line, "thirdput %o %s %[^\n]", &mode, filename_encoded, path) == 3) {
+			url_decode(filename_encoded,filename,sizeof(filename));
 			r = do_thirdput(master, mode, filename, path);
 			reset_idle_timer();
 		} else if(sscanf(line, "kill %" SCNd64, &taskid) == 1) {
@@ -1468,7 +1598,8 @@ static int handle_master(struct link *master) {
 				kill_all_tasks();
 				r = 1;
 			}
-		} else if(sscanf(line, "invalidate-file %s", filename) == 1) {
+		} else if(sscanf(line, "invalidate-file %s", filename_encoded) == 1) {
+			url_decode(filename_encoded,filename,sizeof(filename));
 			r = do_invalidate_file(filename);
 		} else if(!strncmp(line, "release", 8)) {
 			r = do_release();
@@ -2228,7 +2359,7 @@ static void show_help(const char *cmd)
 	printf( " %-30s Name of master (project) to contact.  May be a regular expression.\n", "-N,-M,--master-name=<name>");
 	printf( " %-30s Catalog server to query for masters.  (default: %s:%d) \n", "-C,--catalog=<host:port>",CATALOG_HOST,CATALOG_PORT);
 	printf( " %-30s Enable debugging for this subsystem.\n", "-d,--debug=<subsystem>");
-	printf( " %-30s Send debugging to this file. (can also be :stderr, :stdout, :syslog, or :journal)\n", "-o,--debug-file=<file>");
+	printf( " %-30s Send debugging to this file. (can also be :stderr, or :stdout)\n", "-o,--debug-file=<file>");
 	printf( " %-30s Set the maximum size of the debug log (default 10M, 0 disables).\n", "--debug-rotate-max=<bytes>");
 	printf( " %-30s Set worker to run as a foreman.\n", "--foreman");
 	printf( " %-30s Run as a foreman, and advertise to the catalog server with <name>.\n", "-f,--foreman-name=<name>");