diff --git a/ChangeLog b/ChangeLog
index c6a0ad4..c8edbf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 E-MailRelay Change Log
 ======================
 
+2.2 -> 2.2.1
+------------
+* Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+* Windows event log not used for verbose logging (prefer "--log-file").
+* New admin 'forward' command to trigger forwarding without waiting.
+* Support for MbedTLS version 3.
+
 2.1 -> 2.2
 ----------
 * Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
@@ -24,7 +31,7 @@ E-MailRelay Change Log
 * New "--idle-timeout" option for server-side connections.
 * Support for RFC-5782 DNSBL blocking ("--dnsbl").
 * Filter scripts are given the path of the envelope file in argv2.
-* Message files can be editied by "--client-filter" scripts.
+* Message files can be edited by "--client-filter" scripts.
 * Better support for CRAM-SHAx authentication.
 * New "--client-auth-config" and "--server-auth-config" options.
 * New "--show" option on windows to better control the user interface style.
diff --git a/Makefile.in b/Makefile.in
index db9ce43..54124f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -134,7 +134,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -200,9 +200,8 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)gconfig_defs.h.in
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -223,9 +222,8 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gconfig_defs.h.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS README compile \
-	install-sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS README compile depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -330,6 +328,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -366,6 +365,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -414,8 +414,7 @@ e_doc_DATA = COPYING AUTHORS INSTALL NEWS README ChangeLog
 RPM = $(RPM_ROOT)/RPMS/$(ARCH)/emailrelay-$(VERSION)-1.$(ARCH).rpm
 TAR = emailrelay-$(VERSION).tar.gz
 DEB = emailrelay_$(VERSION)_$(ARCH).deb
-all: gconfig_defs.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
@@ -439,8 +438,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -451,21 +450,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-
-gconfig_defs.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/gconfig_defs.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status gconfig_defs.h
-$(srcdir)/gconfig_defs.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f gconfig_defs.h stamp-h1
 install-e_docDATA: $(e_doc_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(e_doc_DATA)'; test -n "$(e_docdir)" || list=; \
@@ -594,7 +578,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -659,7 +646,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -685,7 +672,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -703,7 +690,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -713,7 +700,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -784,7 +771,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA) gconfig_defs.h
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(e_docdir)"; do \
@@ -827,7 +814,7 @@ clean-am: clean-generic mostlyclean-am
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -889,24 +876,23 @@ ps-am:
 
 uninstall-am: uninstall-e_docDATA uninstall-local
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-e_docDATA install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-e_docDATA \
-	uninstall-local
+	distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-e_docDATA \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-e_docDATA uninstall-local
 
 .PRECIOUS: Makefile
 
diff --git a/NEWS b/NEWS
index 08ca19a..3cd8551 100644
--- a/NEWS
+++ b/NEWS
@@ -22,3 +22,7 @@ as an "examples" file. Use "e_systemddir=/usr/lib/systemd/system" on the
 
 This release has a new "make tidy" option that runs "clang-tidy" over the
 code and also "make cmake" to generate simple cmake files for a unix build.
+
+Version 2.2.1 adds support for unix-domain sockets. 
+
+Thanks to Per-Arne Christensen for the Norwegian translation of the GUI.
diff --git a/VERSION b/VERSION
index 8bbe6cf..c043eea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2
+2.2.1
diff --git a/aclocal.m4 b/aclocal.m4
index a99cd41..7050dbb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/autogen.sh b/autogen.sh
old mode 100755
new mode 100644
diff --git a/bin/AutoMakeParser.pm b/bin/AutoMakeParser.pm
index e19f3aa..15fc9dc 100644
--- a/bin/AutoMakeParser.pm
+++ b/bin/AutoMakeParser.pm
@@ -35,6 +35,7 @@
 #  $makefile->libraries() ;
 #  $makefile->includes() ;
 #  $makefile->definitions() ;
+#  $makefile->compile_options() ;
 #  $makefile->sources('foo') ;
 #  $makefile->our_libs('foo') ;
 #  $makefile->sys_libs('foo') ;
@@ -51,19 +52,20 @@ our $debug = 0 ;
 
 sub new
 {
-	my ( $classname , $path , $switches , $ro_vars ) = @_ ;
+	my ( $classname , $path , $switches , $vars_in ) = @_ ;
 	my %me = (
 		m_path => simplepath($path) ,
+		m_switches => $switches ,
+		m_vars => {} ,
 		m_depth => undef , # from readall()
 		m_lines => [] ,
-		m_vars => {} ,
-		m_switches => $switches ,
 		m_stack => [] ,
 	) ;
 	my $this = bless \%me , $classname ;
 	$this->read( $path ) ;
 	$this->parse( $path ) ;
-	$this->expand_all( $ro_vars ) ;
+	$this->expand_all( $vars_in ) ;
+	$this->copy( $vars_in ) ;
 	return $this ;
 }
 
@@ -74,22 +76,23 @@ sub path
 
 sub readall
 {
-	my ( $base_dir , $switches , $vars , $verbose ) = @_ ;
+	my ( $base_dir , $switches , $vars , $verbose , $verbose_prefix ) = @_ ;
 	my @makefiles = () ;
-	_readall_imp( \@makefiles , 0 , $base_dir , $switches , $vars , $verbose ) ; # recursive
+	_readall_imp( \@makefiles , 0 , $base_dir , $switches , $vars , $verbose , $verbose_prefix ) ; # recursive
 	return @makefiles ;
 }
 
 sub _readall_imp
 {
-	my ( $makefiles , $depth , $dir , $switches , $vars , $verbose ) = @_ ;
+	my ( $makefiles , $depth , $dir , $switches , $vars , $verbose , $verbose_prefix ) = @_ ;
+	$verbose_prefix ||= "" ;
 	my $m = new AutoMakeParser( "$dir/Makefile.am" , $switches , $vars ) ;
 	$m->{m_depth} = $depth ;
-	print "makefile=[" , $m->path() , "] ($depth)\n" if $verbose ;
+	print "${verbose_prefix}makefile=[" , $m->path() , "] ($depth)\n" if $verbose ;
 	push @$makefiles , $m ;
 	for my $subdir ( $m->value("SUBDIRS") )
 	{
-		_readall_imp( $makefiles , $depth+1 , "$dir/$subdir" , $switches , $vars , $verbose ) ;
+		_readall_imp( $makefiles , $depth+1 , "$dir/$subdir" , $switches , $vars , $verbose , $verbose_prefix ) ;
 	}
 }
 
@@ -159,10 +162,15 @@ sub sys_libs
 {
 	my ( $this , $program ) = @_ ;
 	( my $prefix = $program ) =~ s/[-.]/_/g ;
-	return
+	my @a =
+		map { s/-l// ; $_ }
+		grep { m/^-l/ }
+		$this->value( "LIBS" ) ;
+	my @b =
 		map { s/-l// ; $_ }
 		grep { m/^-l/ }
 		$this->value( "${prefix}_LDADD" ) ;
+	return ( @a , @b ) ;
 }
 
 sub sources
@@ -174,11 +182,51 @@ sub sources
 		$this->value( "${prefix}_SOURCES" ) ;
 }
 
+sub link_options
+{
+	my ( $this ) = @_ ;
+	my @a = $this->value( "AM_LDFLAGS" ) ;
+	my @b = $this->value( "LDFLAGS" ) ;
+	my @options = ( @a , @b ) ;
+	return wantarray ? @options : join(" ",@options) ;
+}
+
+sub compile_options
+{
+	my ( $this ) = @_ ;
+	my @a = $this->_compile_options_imp( "AM_CPPFLAGS" , $this->{m_vars} ) ;
+	my @b = $this->_compile_options_imp( "CXXFLAGS" , $this->{m_vars} ) ;
+	my @options = ( @a , @b ) ;
+	return wantarray ? @options : join(" ",@options) ;
+}
+
+sub _compile_options_imp
+{
+	my ( $this , $var , $vars ) = @_ ;
+	$vars ||= $this->{m_vars} ;
+	my $s = protect_quoted_spaces( simple_spaces( $vars->{$var} ) ) ;
+	$s =~ s/-D /-D/g ;
+	$s =~ s/-I /-I/g ;
+	return
+		map { s/\t/ /g ; $_ }
+		grep { !m/-I/ }
+		grep { !m/-D/ }
+		split( " " , $s ) ;
+}
+
 sub definitions
 {
-	my ( $this , $am_cppflags ) = @_ ;
-	$am_cppflags ||= "AM_CPPFLAGS" ;
-	my $s = protect_quoted_spaces( simple_spaces( $this->{m_vars}->{$am_cppflags} ) ) ;
+	my ( $this ) = @_ ;
+	my @a = $this->_definitions_imp( "AM_CPPFLAGS" , $this->{m_vars} ) ;
+	my @b = $this->_definitions_imp( "CXXFLAGS" , $this->{m_vars} ) ;
+	my @defs = ( @a , @b ) ;
+	return wantarray ? @defs : join(" ",@defs) ;
+}
+
+sub _definitions_imp
+{
+	my ( $this , $var , $vars ) = @_ ;
+	my $s = protect_quoted_spaces( simple_spaces( $vars->{$var} ) ) ;
 	$s =~ s/-D /-D/g ;
 	return
 		map { s/\t/ /g ; $_ }
@@ -194,29 +242,41 @@ sub includes
 	# with the 'top_srcdir' variable defined as "." gives
 	# ("./one/two","./three").
 	#
-	# However, since the 'top_srcdir' expansion is fixed, and the
+	# However, since the 'top_srcdir' expansion is fixed, and
 	# relative include paths need to vary through the source
-	# tree, a prefix parameter ('top') can be passed in here.
-	# So then "-I$(top_srcdir)/one/two" becomes "<top>/./one/two".
+	# tree, a prefix parameter ('top') should be passed in as
+	# the current value for expanding "$(top_srcdir)". So then
+	# "-I$(top_srcdir)/one/two" becomes "<top>/./one/two".
+	# (Absolute paths do not get the 'top' prefixed by 'top'.)
 	#
-	# The 'top' parameter can be from top() as long as readall()
-	# started at the 'top_srcdir' directory and the 'top_srcdir'
-	# variable is defined as ".". Otherwise, a simple approach
-	# is to still use top() for the 'top' parameter but define
-	# the 'top_srcdir' variable as the difference between the
-	# readall() base and the actual 'top_srcdir' directory.
+	# The "top()" method provides a candidate for the 'top'
+	# parameter but will only work if readall() started at the
+	# 'top_srcdir' directory and the 'top_srcdir' variable is
+	# defined as ".". Otherwise, a simple approach is to still
+	# use top() for the 'top' parameter but define the 'top_srcdir'
+	# variable as the difference between the readall() base and
+	# the actual 'top_srcdir' directory.
 	#
-	my ( $this , $top , $am_cppflags , $extra_includes , $full_paths ) = @_ ;
+	my ( $this , $top , $full_paths , $no_top_dir ) = @_ ;
 	$top ||= "" ;
-	$am_cppflags ||= "AM_CPPFLAGS" ;
-	$extra_includes ||= "" ;
-	my $cppflags = join( " " , $extra_includes , $this->{m_vars}->{$am_cppflags} ) ;
-	my $s = protect_quoted_spaces( simple_spaces( $cppflags ) ) ;
+	my $add_top = !$no_top_dir ;
+	my $real_top = simplepath( join( "/" , $this->value("top_srcdir") , $top ) ) ;
+	my @a = $this->_includes_imp( $top , "AM_CPPFLAGS" , $this->{m_vars} , $full_paths ) ;
+	my @b = $this->_includes_imp( $top , "CXXFLAGS" , $this->{m_vars} , $full_paths ) ;
+	my @c = ( $real_top && $add_top ) ? ( $real_top ) : () ;
+	my @incs = ( @c , @a , @b ) ;
+	return wantarray ? @incs : join(" ",@incs) ;
+}
+
+sub _includes_imp
+{
+	my ( $this , $top , $var , $vars , $full_paths ) = @_ ;
+	my $s = protect_quoted_spaces( simple_spaces( $vars->{$var} ) ) ;
 	$s =~ s/-I /-I/g ;
 	return
 		map { $full_paths?$this->fullpath($_):$_ }
 		map { simplepath($_) }
-		map { $top?join("/",$top,$_):$_ }
+		map { my $p=$_ ; ($top&&($p!~m;^/;))?join("/",$top,$p):$p }
 		map { s/\t/ /g ; $_ }
 		map { s:-I:: ; $_ } grep { m/-I\S+/ }
 		split( " " , $s ) ;
@@ -319,6 +379,19 @@ sub add
 	push @{$this->{m_lines}} , $line ;
 }
 
+sub copy
+{
+	my ( $this , $vars_in ) = @_ ;
+	return if !defined($vars_in) ;
+	for my $k ( keys %$vars_in )
+	{
+		if( !exists($this->{m_vars}->{$k}) )
+		{
+			$this->{m_vars}->{$k} = $vars_in->{$k} ;
+		}
+	}
+}
+
 sub read
 {
 	my ( $this , $path ) = @_ ;
@@ -357,7 +430,7 @@ sub parse
 				last ; # (new)
 			}
 		}
-		debug_( "$$this{m_path}($n): " , $this->enabled() ? $line : "..." ) ;
+		debug_( "$$this{m_path}($n): " , $line ) if ( $this->enabled() && ( $line =~ m/\S/ ) && ( $line !~ m/^#/ ) ) ;
 	}
 	for my $k ( sort keys %{$this->{m_vars}} )
 	{
@@ -469,7 +542,9 @@ sub do_assign_more
 
 sub debug_
 {
-	print @_ , "\n" if $debug ;
+	my $line = join( " " , @_ ) ;
+	$line =~ s/ *\t */ /g ;
+	print $line , "\n" if $debug ;
 }
 
 1 ;
diff --git a/bin/CompilationDatabase.pm b/bin/CompilationDatabase.pm
index 9d09d06..dd1ad33 100644
--- a/bin/CompilationDatabase.pm
+++ b/bin/CompilationDatabase.pm
@@ -26,8 +26,7 @@
 # Synopsis:
 #
 #    use CompilationDatabase ;
-#    my $cdb = new CompilationDatabase( $src_dir ,
-#        ["-DFOO=BAR",...] , ["-I_TOP_"] , ["-Wall"] , {WINDOWS=>0,...} , {top_srcdir=>'..'} ) ;
+#    my $cdb = new CompilationDatabase( $src_dir , {WINDOWS=>0,...} , {top_srcdir=>'..'} , {} ) ;
 #    my @files = $cdb->list() ;
 #    my @stanzas = $cdb->stanzas() ;
 #    $cdb->print() ;
@@ -42,16 +41,16 @@ our $debug = 0 ;
 
 sub new
 {
-	my ( $classname , $base_makefile_dir , $dflags , $iflags , $cxxflags , $switches , $ro_vars ) = @_ ;
+	my ( $classname , $base_makefile_dir , $switches , $ro_vars , $config ) = @_ ;
 	$AutoMakeParser::debug = 1 if $debug > 1 ;
+	$config ||= {} ;
+	$config->{test_mode} ||= 0 ;
+	$config->{full_paths} ||= 0 ;
 	my %me = (
 		m_base_dir => $base_makefile_dir ,
-		m_dflags => $dflags ,
-		m_iflags => $iflags ,
-		m_cxxflags => $cxxflags ,
 		m_switches => $switches ,
 		m_ro_vars => $ro_vars ,
-		m_full_paths => 0 ,
+		m_config => $config ,
 	) ;
 	return bless \%me , $classname ;
 }
@@ -95,26 +94,28 @@ sub stanzas
 	for my $m ( @makefiles )
 	{
 		my $dir = File::Basename::dirname( $m->path() ) ;
-		my @includes = map { "-I$_" } $m->includes( $m->top() , undef , join(" ",@{$this->{m_iflags}}) , $this->{m_full_paths} ) ;
+		my @includes = map { "-I$_" } $m->includes( $m->top() , undef , undef , $this->{m_config}->{full_paths} ) ;
 		my @definitions = map { "-D$_" } $m->definitions() ;
-		push @definitions , @{$this->{m_dflags}} ;
+		my @compile_options = $m->compile_options() ;
+		my @link_options = $m->link_options() ;
 
 		if( $debug )
 		{
 			print "cdb: makefile=" , $m->path() , "\n" ;
-			print "cdb:  AM_CPPFLAGS=[",join("|",$m->value("AM_CPPFLAGS")),"]\n" ;
 			print "cdb:  top=",$m->top(),"\n" ;
 			print "cdb:  \@includes=" , join("|",@includes) , "\n" ;
 			print "cdb:  \@definitions=" , join("|",@definitions) , "\n" ;
+			print "cdb:  \@compile_options=" , join("|",@compile_options) , "\n" ;
+			print "cdb:  \@link_options=" , join("|",@link_options) , "\n" ;
 		}
 
 		for my $library ( $m->libraries() )
 		{
-			map { push @output , $this->_stanza($dir,$_,\@includes,\@definitions) } $m->sources($library) ;
+			map { push @output , $this->_stanza($dir,$_,\@includes,\@definitions,\@compile_options) } $m->sources($library) ;
 		}
 		for my $program ( $m->programs() )
 		{
-			map { push @output , $this->_stanza($dir,$_,\@includes,\@definitions) } $m->sources($program) ;
+			map { push @output , $this->_stanza($dir,$_,\@includes,\@definitions,\@compile_options) } $m->sources($program) ;
 		}
 	}
 	return @output ;
@@ -122,15 +123,20 @@ sub stanzas
 
 sub _stanza
 {
-	my ( $this , $dir , $source , $includes , $definitions ) = @_ ;
+	my ( $this , $dir , $source , $includes , $definitions , $options ) = @_ ;
 
-	my @all_flags = ( @{$this->{m_cxxflags}} , @$definitions , @$includes ) ;
+	my @all_flags = ( @$definitions , @$includes , @$options ) ;
 
 	my $directory = Cwd::realpath( $dir ) ;
-	$source = join("/",$directory,$source) if $this->{m_full_paths} ;
+	$source = join("/",$directory,$source) if $this->{m_config}->{full_paths} ;
 
 	my $command = "/usr/bin/c++ @all_flags -c $source" ;
-	$command =~ s/"/\\"/g ;
+	$command =~ s/"/\\"/g unless $this->{m_config}->{test_mode} ;
+
+	if( $this->{m_config}->{test_mode} )
+	{
+		return "cd $directory && $command\n" ;
+	}
 
 	return
 		"{\n" .
diff --git a/bin/ConfigStatus.pm b/bin/ConfigStatus.pm
new file mode 100644
index 0000000..f5ef715
--- /dev/null
+++ b/bin/ConfigStatus.pm
@@ -0,0 +1,124 @@
+#!/usr/bin/perl
+#
+# Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# ConfigStatus.pm
+#
+# Provides 'switches' and 'vars' parsed out of a "config.status"
+# file (as generated by an autoconf configure script).
+#
+# Synopsis:
+#  use ConfigStatus ;
+#  my $cs = new ConfigStatus( "config.status" ) ;
+#  my %vars = $cs->vars() ;
+#  my %switches = $cs->switches() ;
+#
+# See also: AutoMakeParser
+#
+
+use strict ;
+use FileHandle ;
+
+package ConfigStatus ;
+
+sub new
+{
+	my ( $classname , $filename ) = @_ ;
+	my $this = bless {
+		m_vars => {} ,
+		m_switches => {} ,
+	} , $classname ;
+	$this->parse( $filename ) if $filename ;
+	return $this ;
+}
+
+sub vars
+{
+	my ( $this ) = @_ ;
+	return %{$this->{m_vars}} ;
+}
+
+sub switches
+{
+	my ( $this ) = @_ ;
+	return %{$this->{m_switches}} ;
+}
+
+sub parse
+{
+	my ( $this , $filename ) = @_ ;
+	$filename ||= "config.status" ;
+	$this->{m_vars} = {} ;
+	$this->{m_switches} = {} ;
+	my $fh = new FileHandle( $filename , "r" ) or die "error: cannot open [$filename]: " . lc($!) . "\n" ;
+	while(<$fh>)
+	{
+		chomp( my $line = $_ ) ;
+		while( $line =~ m/\\$/ )
+		{
+			$line = substr( $line , 0 , length($line)-2 ) ; # remove doublequote-backslash
+			my $next = <$fh> ;
+			chomp( $next ) ;
+			$next =~ s/^"// ;
+			$line .= $next ;
+		}
+		my ( $k , $v ) = ( $line =~ m/^S\["([^"]+)"\]="([^"]*)"\s*$/ ) ;
+		if( $k && defined($v) )
+		{
+			if( $k =~ m/_TRUE$/ )
+			{
+				( my $kk = $k ) =~ s/_TRUE$// ;
+				my $vv = ( $v eq "" ? 1 : 0 ) ;
+				$this->{m_switches}->{$kk} = $vv ;
+			}
+			elsif( $k =~ m/_FALSE$/ )
+			{
+				( my $kk = $k ) =~ s/_FALSE$// ;
+				my $vv = ( $v eq "" ? 0 : 1 ) ;
+				$this->{m_switches}->{$kk} = $vv ;
+			}
+			else
+			{
+				$this->{m_vars}->{$k} = $v ;
+			}
+		}
+	}
+	$this->_expand() ;
+	return $this ;
+}
+
+sub _expand
+{
+	my ( $this ) = @_ ;
+	for my $k ( sort keys %{$this->{m_vars}} )
+	{
+		my $v = $this->{m_vars}->{$k} ;
+		for my $i ( 0 .. 10 )
+		{
+			my ( $subkey ) = ( $v =~ m/\$\{([^}]*)\}/ ) ;
+			if( $subkey && exists($this->{m_vars}->{$subkey}) )
+			{
+				my $new = $this->{m_vars}->{$subkey} ;
+				$v =~ s/\$\{$subkey\}/$new/ ;
+			}
+		}
+		$this->{m_vars}->{$k} = $v ;
+	}
+	return $this ;
+}
+
+1 ;
diff --git a/bin/Makefile.am b/bin/Makefile.am
index bb2a534..3b6b7ee 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -52,6 +52,7 @@ work_scripts = \
 	make2cdb \
 	AutoMakeParser.pm \
 	CompilationDatabase.pm \
+	ConfigStatus.pm \
 	winbuild.pm
 
 js_scripts = \
diff --git a/bin/Makefile.in b/bin/Makefile.in
index e51ecb1..79dea1e 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -100,7 +100,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -218,6 +218,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -254,6 +255,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -317,6 +319,7 @@ work_scripts = \
 	make2cdb \
 	AutoMakeParser.pm \
 	CompilationDatabase.pm \
+	ConfigStatus.pm \
 	winbuild.pm
 
 js_scripts = \
@@ -369,8 +372,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -479,7 +482,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/bin/emailrelay-deliver.sh.in b/bin/emailrelay-deliver.sh.in
old mode 100755
new mode 100644
diff --git a/bin/emailrelay-notify.sh.in b/bin/emailrelay-notify.sh.in
old mode 100755
new mode 100644
diff --git a/bin/emailrelay-resubmit.sh.in b/bin/emailrelay-resubmit.sh.in
old mode 100755
new mode 100644
diff --git a/bin/emailrelay-sendmail.pl b/bin/emailrelay-sendmail.pl
index c6b0a4f..903f9b0 100755
--- a/bin/emailrelay-sendmail.pl
+++ b/bin/emailrelay-sendmail.pl
@@ -15,15 +15,61 @@
 #
 
 use strict ;
+use FileHandle ;
 use Getopt::Std ;
 
-# parse and mostly ignore sendmail command-line options
-my $usage = "usage: emailrelay-sendmail [-intUv] [-BbCdFhNOopqRrVX <arg>] [-f <from>] <to> [<to> ...]" ;
-my %opt = () ;
-getopts( 'B:b:C:d:F:f:h:iN:nO:o:p:q:R:r:tUV:vX:' , \%opt ) or die "$usage\n" ;
-
-# submit into the emailrelay spool directory
-my $from = defined($opt{f}) ? $opt{f} : $ENV{USER} ;
 my $exe = "/usr/sbin/emailrelay-submit" ;
-my @args = ( $exe , "-f" , $from , @ARGV ) ; # also consider using "--copy" and "--content-date"
-exec { $exe } @args ;
+
+# parse and mostly ignore sendmail command-line options
+my $usage = "usage: emailrelay-sendmail [-intUv] [-ABbCDdFfGhiLNnOopqRrtUVvX <arg>] [-f <from>] <to> [<to> ...]" ;
+my %opt = () ;
+getopts( 'A:B:b:C:D:d:F:f:Gh:iL:N:nO:o:p:q:R:r:tUV:vX:' , \%opt ) or die "$usage\n" ;
+my $from = defined($opt{f}) ? $opt{f} : $ENV{USER} ;
+my @submit_args = ( "--content-date" , @ARGV ) ; # also consider using "--copy"
+
+# if "-t" read envelope 'to' addresses from content headers
+if( $opt{t} )
+{
+	# read content headers
+	my %h = () ;
+	my @h = () ;
+	my $k = "" ;
+	while(<STDIN>)
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+		last if ( $line eq "" ) ;
+        my ( $a , $b , $c , $d ) = ( $line =~ m/^(\S*):\s*(.*)|^(\s)(.*)/ ) ;
+        if( $a ) { $k = lc($a) ; $h{$k} = $b }
+        if( $k && $d ) { $h{$k} .= "$c$d" } # folding
+		push @h , $line unless ( lc($k) eq 'bcc' ) ; # remove Bcc
+	}
+
+	# extract 'to' addresses
+	my @to = () ;
+	push @to , split(" ",$h{to}) if exists($h{to}) ;
+	push @to , split(" ",$h{cc}) if exists($h{cc}) ;
+	push @to , split(" ",$h{bcc}) if exists($h{bcc}) ;
+
+	# write headers and copy body into temp file
+	my $tmp = "/tmp/emailrelay-sendmail.$$.tmp" ;
+	my $fh = new FileHandle( $tmp , "w" ) or die ;
+	map { print $fh $_ , "\r\n" } @h ;
+	print $fh "\r\n" ;
+	while(<STDIN>) { print $fh $_ }
+	$fh->close() or die ;
+
+	# make stdin read from the temp file
+	open STDIN , '<' , $tmp or die ;
+	unlink $tmp or die ;
+
+	# run emailrelay-submit
+	my @args = ( $exe , "-f" , $from , @to ) ;
+	exec { $exe } @args ;
+}
+else
+{
+	# run emailrelay-submit
+	my @args = ( $exe , "-f" , $from , @submit_args ) ;
+	exec { $exe } @args ;
+}
diff --git a/bin/emailrelay-set-from.js b/bin/emailrelay-set-from.js
index 35ad6c8..55336b7 100755
--- a/bin/emailrelay-set-from.js
+++ b/bin/emailrelay-set-from.js
@@ -83,7 +83,7 @@ try
 
 	WScript.Quit( 0 ) ;
 }
-catch
+catch( e )
 {
 	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
 	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
diff --git a/bin/emailrelay-submit.sh.in b/bin/emailrelay-submit.sh.in
old mode 100755
new mode 100644
diff --git a/bin/make2cdb b/bin/make2cdb
index 740dd96..b098be2 100755
--- a/bin/make2cdb
+++ b/bin/make2cdb
@@ -38,74 +38,38 @@ use File::Find ;
 use File::Basename ;
 use File::Spec ;
 use File::Copy ;
+use Getopt::Long ;
 use lib dirname($0) ;
+use ConfigStatus ;
 use CompilationDatabase ;
-$CompilationDatabase::debug = 0 ;
 
-my $show_list = $ARGV[0] eq "--list" ;
-shift @ARGV if $show_list ;
+my %opt = () ;
+GetOptions( \%opt , "list" , "test" , "debug" ) or die "$0: usage error\n" ;
+my $cfg_show_list = exists( $opt{list} ) ;
+my $cfg_test_mode = exists( $opt{test} ) ;
+my $cfg_debug = exists( $opt{debug} ) ;
+$CompilationDatabase::debug = $cfg_debug ;
+$AutoMakeParser::debug = $cfg_debug ;
 
 my $src_dir = @ARGV ? $ARGV[0] : dirname($0)."/../src" ;
 my $top_dir = @ARGV >= 1 ? $ARGV[1] : "$src_dir/.." ;
 my $src_to_top = @ARGV >= 2 ? $ARGV[2] : ".." ;
 
-my @dflags = (
-	"-DG_UNIX=1" ,
-) ;
+my $cs = new ConfigStatus( "$top_dir/config.status" ) ;
+my %switches = $cs->switches() ;
+my %vars = $cs->vars() ;
+$vars{top_srcdir} = $src_to_top ;
+$vars{top_builddir} = "." ;
 
-# makefile conditionals
-my %switches = (
-	GCONFIG_BSD => 0 ,
-	GCONFIG_GUI => 0 ,
-	GCONFIG_ICONV => 0 ,
-	GCONFIG_INSTALL_HOOK => 0 ,
-	GCONFIG_INTERFACE_NAMES => 1 ,
-	GCONFIG_MAC => 0 ,
-	GCONFIG_PAM => 0 ,
-	GCONFIG_TESTING => 0 ,
-	GCONFIG_TLS_USE_BOTH => 0 ,
-	GCONFIG_TLS_USE_MBEDTLS => 0 ,
-	GCONFIG_TLS_USE_NONE => 0 ,
-	GCONFIG_TLS_USE_OPENSSL => 1 ,
-	GCONFIG_WINDOWS => 0 ,
-) ;
-
-# makefile expansion variables -- many are required but not relevant
-my %vars = (
-	top_srcdir => $src_to_top ,
-	top_builddir => "." ,
-	sbindir => "." ,
-	mandir => "." ,
-	localedir => "." ,
-	e_spooldir => "/var/spool/emailrelay" ,
-	e_docdir => "." ,
-	e_initdir => "." ,
-	e_bsdinitdir => "." ,
-	e_rundir => "." ,
-	e_icondir => "." ,
-	e_examplesdir => "." ,
-	e_libexecdir => "." ,
-	e_pamdir => "." ,
-	e_sysconfdir => "/etc" ,
-	GCONFIG_WINDRES => "" ,
-	GCONFIG_WINDMC => "" ,
-	GCONFIG_QT_LIBS => "" ,
-	GCONFIG_QT_CFLAGS => "" ,
-	GCONFIG_QT_MOC => "" ,
-	GCONFIG_TLS_LIBS => "" ,
-	GCONFIG_STATIC_START => "" ,
-	GCONFIG_STATIC_END => "" ,
-	RPM_ARCH => "x86" ,
-	RPM_ROOT => "rpm" ,
-) ;
-
-my $cdb = new CompilationDatabase( $src_dir , ["-DG_UNIX=1"], ["-I$src_to_top"] , ["-std=c++11","-pthread"] , \%switches , \%vars ) ;
-$cdb->{m_full_paths} = 1 ; # grr
-
-if( $show_list )
+my $cdb = new CompilationDatabase( $src_dir , \%switches , \%vars , {test_mode=>$cfg_test_mode,full_paths=>1} ) ;
+if( $cfg_show_list )
 {
 	print join( "\n" , $cdb->list() , "" ) ;
 }
+elsif( $cfg_test_mode )
+{
+	print join( "" , $cdb->stanzas() ) ;
+}
 else
 {
 	print "[\n" ;
diff --git a/bin/make2cmake b/bin/make2cmake
index f0fff04..056588e 100755
--- a/bin/make2cmake
+++ b/bin/make2cmake
@@ -18,16 +18,21 @@
 #
 # make2cmake
 #
-# Parses automake files throughout the source tree and generates
-# simplistic cmake files for a unix build.
+# Parses the autoconf/automake artifacts throughout the source tree
+# in order to generates simplistic 'cmake' files.
 #
 # Eg:
-#   $ ./make2cmake
+#   $ CXXFLAGS="-X" ./configure --with-whatever
+#   $ bin/make2cmake
 #   $ mkdir build
 #   $ cd build
-#   $ cmake -DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make ..
+#   $ cmake ..
 #   $ make VERBOSE=1
 #
+# The autoconf CXXFLAGS flow through to 'target_compile_options()' (etc)
+# directives in the 'CMakeLists' files; other autoconf options flow
+# through the 'config.status' file.
+#
 # See also: winbuild.pl
 #
 
@@ -39,87 +44,62 @@ use File::Basename ;
 use File::Spec ;
 use File::Copy ;
 use lib dirname($0) ;
+use ConfigStatus ;
 use AutoMakeParser ;
 $AutoMakeParser::debug = 0 ;
+my $cfg_verbose = 1 ;
+my $cfg_project = "emailrelay" ;
 
-# makefile conditionals
-my %switches = (
-	GCONFIG_BSD => 0 ,
-	GCONFIG_GUI => 0 ,
-	GCONFIG_ICONV => 0 ,
-	GCONFIG_INSTALL_HOOK => 0 ,
-	GCONFIG_INTERFACE_NAMES => 1 ,
-	GCONFIG_MAC => 0 ,
-	GCONFIG_PAM => 0 ,
-	GCONFIG_TESTING => 0 ,
-	GCONFIG_TLS_USE_BOTH => 0 ,
-	GCONFIG_TLS_USE_MBEDTLS => 0 ,
-	GCONFIG_TLS_USE_NONE => 0 ,
-	GCONFIG_TLS_USE_OPENSSL => 1 ,
-	GCONFIG_WINDOWS => 0 ,
+my $cs = new ConfigStatus( "config.status" ) ;
+my %switches = $cs->switches() ;
+my %vars = $cs->vars() ;
+my %qt_config = (
+	dirs => { "gui" => 1 } ,
+	targets => { "emailrelay-gui.real" => 1 } ,
 ) ;
 
-# makefile expansion variables -- many are required but not relevant
-my %vars = (
-	top_srcdir => "." ,
-	top_builddir => "." ,
-	sbindir => "." ,
-	mandir => "." ,
-	localedir => "." ,
-	e_spooldir => "/var/spool/emailrelay" ,
-	e_docdir => "." ,
-	e_initdir => "." ,
-	e_bsdinitdir => "." ,
-	e_rundir => "." ,
-	e_icondir => "." ,
-	e_examplesdir => "." ,
-	e_libexecdir => "." ,
-	e_pamdir => "." ,
-	e_sysconfdir => "/etc" ,
-	GCONFIG_WINDRES => "" ,
-	GCONFIG_WINDMC => "" ,
-	GCONFIG_QT_LIBS => "" ,
-	GCONFIG_QT_CFLAGS => "" ,
-	GCONFIG_QT_MOC => "" ,
-	GCONFIG_TLS_LIBS => "-lssl -lcrypto" ,
-	GCONFIG_STATIC_START => "" ,
-	GCONFIG_STATIC_END => "" ,
-	RPM_ARCH => "x86" ,
-	RPM_ROOT => "rpm" ,
-	VERSION => FileHandle->new("VERSION")->gets() ,
-) ;
+$vars{top_srcdir} = "." ;
+$vars{top_builddir} = "." ;
 
-run_generate( "emailrelay" , \%switches , \%vars ) ;
+create_cmake_files( $cfg_project , \%switches , \%vars , \%qt_config ) ;
+create_empty_gconfig_header() ;
 
 # ==
 
 sub create_cmake_file
 {
-	my ( $project , $m , $switches ) = @_ ;
+	my ( $project , $m , $switches , $vars , $qt_config ) = @_ ;
 
 	my $path = join( "/" , dirname($m->path()) , "CMakeLists.txt" ) ;
 
-	print "cmake-file=[$path]\n" ;
+	_log( "cmake-file=[$path]" ) ;
 	my $fh = new FileHandle( $path , "w" ) or die ;
 
-	my $compile_options = "-std=c++11 -pthread" ;
-	my $link_options = "-pthread" ;
+	my $link_options = $m->link_options() ;
+	my $compile_options = $m->compile_options() ;
+	$compile_options = join(" ",$compile_options,"-std=c++11") if( $compile_options !~ m/std=c++/ ) ;
 
 	print $fh "# $path -- generated by $0\n" ;
 	if( $project )
 	{
-		print $fh "cmake_minimum_required(VERSION 2.8.11)\n" ;
+		print $fh "cmake_minimum_required(VERSION 3.12)\n" ;
 		print $fh "project($project)\n" ;
 		print $fh "add_compile_options($compile_options)\n" ;
 	}
 
-	print $fh "\n" ;
+	if( exists $qt_config->{dirs}->{basename(dirname($m->path()))} )
+	{
+		print $fh "\n" ;
+		print $fh "find_package(Qt5 REQUIRED COMPONENTS Widgets Gui Core)\n" ;
+	}
+
+	print $fh "\n" if $m->subdirs() ;
 	for my $subdir ( $m->subdirs() )
 	{
 		print $fh "add_subdirectory($subdir)\n" ;
 	}
 
-	my $definitions = join( " " , "G_UNIX=1" , $m->definitions() ) ;
+	my $definitions = join( " " , $m->definitions() ) ;
 	my $includes = join( " " , "." , ".." , $m->includes($m->top()) ) ;
 
 	my @libraries = $m->libraries() ;
@@ -130,8 +110,10 @@ sub create_cmake_file
 		( my $library_key = $library ) =~ s/\.a$// ; $library_key =~ s/^lib// ;
 		print $fh "\n" ;
 		print $fh "add_library($library_key $sources)\n" ;
+		print $fh "target_compile_options($library_key PUBLIC $compile_options)\n" ;
 		print $fh "target_include_directories($library_key PUBLIC $includes)\n" ;
 		print $fh "target_compile_definitions($library_key PUBLIC $definitions)\n" ;
+		print $fh "set_target_properties($library_key PROPERTIES AUTOMOC ON)\n" if exists $qt_config->{targets}->{$library_key} ;
 	}
 
 	my @programs = $m->programs() ;
@@ -147,9 +129,11 @@ sub create_cmake_file
 
 		print $fh "\n" ;
 		print $fh "add_executable($program $program_sources)\n" ;
+		print $fh "target_link_options($program PUBLIC $link_options)\n" ; # cmake 3.13
 		print $fh "target_include_directories($program PUBLIC $program_includes)\n" ;
 		print $fh "target_compile_definitions($program PUBLIC $definitions)\n" ;
-		print $fh "target_link_libraries($program $link_options $program_libs)\n" ;
+		print $fh "target_link_libraries($program $program_libs)\n" ;
+		print $fh "set_target_properties($program PROPERTIES AUTOMOC ON)\n" if exists $qt_config->{targets}->{$program} ;
 	}
 
 	$fh->close() or die ;
@@ -157,25 +141,18 @@ sub create_cmake_file
 
 sub create_cmake_files
 {
-	my ( $project , $switches , $vars ) = @_ ;
+	my ( $project , $switches , $vars , $qt_config ) = @_ ;
 
-	my @makefiles = AutoMakeParser::readall( "." , $switches , $vars , 1 ) ;
+	my @makefiles = AutoMakeParser::readall( "." , $switches , $vars , $cfg_verbose , "make2cmake: " ) ;
 	my $first = 1 ;
 	for my $m ( @makefiles )
 	{
-		create_cmake_file( $first?$project:undef , $m , $switches ) ;
+		create_cmake_file( $first?$project:undef , $m , $switches , $vars , $qt_config ) ;
 		$first = 0 ;
 	}
 }
 
-sub run_generate
-{
-	my ( $project , $switches , $vars ) = @_ ;
-	create_cmake_files( $project , $switches , $vars ) ;
-	create_gconfig_header() ;
-}
-
-sub create_gconfig_header
+sub create_empty_gconfig_header
 {
 	my $path = "src/gconfig_defs.h" ;
 	if( ! -f $path )
@@ -185,3 +162,8 @@ sub create_gconfig_header
 	}
 }
 
+sub _log
+{
+	print "make2cmake: " , @_ , "\n" if $cfg_verbose ;
+}
+
diff --git a/bin/winbuild.pm b/bin/winbuild.pm
index d1d906a..2cd9a1f 100644
--- a/bin/winbuild.pm
+++ b/bin/winbuild.pm
@@ -34,6 +34,7 @@
 #  winbuild::clean_cmake_cache_files(...) ;
 #  winbuild::deltree(...) ;
 #  winbuild::run_msbuild(...) ;
+#  winbuild::translate(...) ;
 #  winbuild::create_touchfile(...) ;
 #  winbuild::read_makefiles(...) ;
 #  winbuild::read_makefiles_imp(...) ;
@@ -145,7 +146,9 @@ sub default_touchfile
 
 sub _path_dirs
 {
-	return split( ";" , $ENV{PATH} ) ;
+	my $path = $ENV{PATH} ;
+	my $sep = ( $path =~ m/;/ ) ? ";" : ":" ;
+	return split( $sep , $path ) ;
 }
 
 sub _sanepath
@@ -175,6 +178,7 @@ sub _find_under
 	my $result ;
 	for my $dir ( map {_sanepath($_)} @dirs )
 	{
+		next if !$dir ;
 		my @find_list = () ;
 		File::Find::find( sub { push @find_list , $File::Find::name if lc($_) eq $fname } , $dir ) ;
 		if( @find_list ) { $result = Cwd::realpath($find_list[0]) ; last }
@@ -326,6 +330,19 @@ sub run_msbuild
 	die unless $rc == 0 ;
 }
 
+sub translate
+{
+	my ( $arch , $qt_dirs , $xx_XX , $xx ) = @_ ;
+	my $dir = $qt_dirs->{$arch} ;
+	$dir = File::Basename::dirname( $dir ) ;
+	$dir = File::Basename::dirname( $dir ) ;
+	$dir = File::Basename::dirname( $dir ) ;
+	my $tool = join( "/" , $dir , "bin" , "lrelease.exe" ) ;
+	my $rc = system( $tool , "src/gui/emailrelay_tr.$xx_XX.ts" , "-qm" , "src/gui/emailrelay.$xx.qm" ) ;
+	print "lrelease-exit=[$rc]\n" ;
+	die unless $rc == 0 ;
+}
+
 sub create_touchfile
 {
 	my ( $touchfile ) = @_ ;
diff --git a/bootstrap b/bootstrap
old mode 100755
new mode 100644
diff --git a/bsd/Makefile.in b/bsd/Makefile.in
index 679723a..2614825 100644
--- a/bsd/Makefile.in
+++ b/bsd/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -215,6 +215,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -251,6 +252,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -304,8 +306,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -358,7 +360,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/configure b/configure
index de76254..1fbdf65 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for E-MailRelay 2.2.
+# Generated by GNU Autoconf 2.69 for E-MailRelay 2.2.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='E-MailRelay'
 PACKAGE_TARNAME='emailrelay'
-PACKAGE_VERSION='2.2'
-PACKAGE_STRING='E-MailRelay 2.2'
+PACKAGE_VERSION='2.2.1'
+PACKAGE_STRING='E-MailRelay 2.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -631,10 +631,13 @@ e_pamdir
 e_libexecdir
 e_examplesdir
 e_spooldir
+e_trdir
 e_icondir
 e_bsdinitdir
 e_initdir
 e_docdir
+GCONFIG_UDS_FALSE
+GCONFIG_UDS_TRUE
 GCONFIG_PAM_FALSE
 GCONFIG_PAM_TRUE
 GCONFIG_TLS_USE_NONE_FALSE
@@ -646,6 +649,8 @@ GCONFIG_TLS_USE_OPENSSL_TRUE
 GCONFIG_TLS_USE_BOTH_FALSE
 GCONFIG_TLS_USE_BOTH_TRUE
 GCONFIG_TLS_LIBS
+GCONFIG_GETTEXT_FALSE
+GCONFIG_GETTEXT_TRUE
 GCONFIG_WINDOWS_FALSE
 GCONFIG_WINDOWS_TRUE
 GCONFIG_TESTING_FALSE
@@ -667,6 +672,7 @@ GCONFIG_EPOLL_FALSE
 GCONFIG_EPOLL_TRUE
 GCONFIG_BSD_FALSE
 GCONFIG_BSD_TRUE
+QT_LRELEASE
 QT_MOC
 QT_LIBS
 QT_CFLAGS
@@ -699,7 +705,6 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -777,7 +782,8 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -802,6 +808,7 @@ with_man2html
 with_openssl
 with_mbedtls
 with_pam
+with_uds
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1371,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures E-MailRelay 2.2 to adapt to many kinds of systems.
+\`configure' configures E-MailRelay 2.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1445,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of E-MailRelay 2.2:";;
+     short | recursive ) echo "Configuration of E-MailRelay 2.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1484,6 +1491,7 @@ Optional Packages:
   --with-openssl          use openssl for tls layer (default auto)
   --with-mbedtls          use mbedtls for tls layer (default auto)
   --with-pam              use linux pam for authentication (default auto)
+  --with-uds              enable unix domain sockets (default auto)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1571,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-E-MailRelay configure 2.2
+E-MailRelay configure 2.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2007,7 +2015,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by E-MailRelay $as_me 2.2, which was
+It was created by E-MailRelay $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2357,7 +2365,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.15'
+am__api_version='1.16'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2872,7 +2880,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='emailrelay'
- VERSION='2.2'
+ VERSION='2.2.1'
 
 
 # Some tools Automake needs.
@@ -2893,8 +2901,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -2945,7 +2953,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -2956,7 +2964,7 @@ END
   fi
 fi
 
-ac_config_headers="$ac_config_headers gconfig_defs.h"
+ac_config_headers="$ac_config_headers src/gconfig_defs.h"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -3643,45 +3651,45 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -6496,6 +6504,55 @@ $as_echo "#define GCONFIG_HAVE_STATBUF_NSEC 0" >>confdefs.h
 
 	fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iovec layout" >&5
+$as_echo_n "checking for iovec layout... " >&6; }
+if ${gconfig_cv_iovec_is_simple+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#include <cstddef>
+			#include <sys/types.h>
+			#include <sys/uio.h>
+			struct simple { const char * p ; std::size_t n ; } ;
+
+int
+main ()
+{
+
+            static_assert( sizeof(simple) == sizeof(::iovec) , "" ) ;
+            static_assert( alignof(simple) == alignof(::iovec) , "" ) ;
+            static_assert( sizeof(simple::p) == sizeof(::iovec::iov_base) , "" ) ;
+            static_assert( sizeof(simple::n) == sizeof(::iovec::iov_len) , "" ) ;
+            static_assert( offsetof(simple,p) == offsetof(::iovec,iov_base) , "" ) ;
+            static_assert( offsetof(simple,n) == offsetof(::iovec,iov_len) , "" ) ;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  gconfig_cv_iovec_is_simple=yes
+else
+  gconfig_cv_iovec_is_simple=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_iovec_is_simple" >&5
+$as_echo "$gconfig_cv_iovec_is_simple" >&6; }
+	if test "$gconfig_cv_iovec_is_simple" = "yes" ; then
+
+$as_echo "#define GCONFIG_HAVE_IOVEC_SIMPLE 1" >>confdefs.h
+
+	else
+
+$as_echo "#define GCONFIG_HAVE_IOVEC_SIMPLE 0" >>confdefs.h
+
+	fi
+
 
 
 
@@ -6555,339 +6612,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ nullptr" >&5
-$as_echo_n "checking for c++ nullptr... " >&6; }
-if ${gconfig_cv_cxx_nullptr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			void * p = nullptr ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_nullptr=yes
-else
-  gconfig_cv_cxx_nullptr=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_nullptr" >&5
-$as_echo "$gconfig_cv_cxx_nullptr" >&6; }
-	if test "$gconfig_cv_cxx_nullptr" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_NULLPTR 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_NULLPTR 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ constexpr" >&5
-$as_echo_n "checking for c++ constexpr... " >&6; }
-if ${gconfig_cv_cxx_constexpr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			template <typename T> struct Foo {static constexpr int foo = 1;} ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_constexpr=yes
-else
-  gconfig_cv_cxx_constexpr=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_constexpr" >&5
-$as_echo "$gconfig_cv_cxx_constexpr" >&6; }
-	if test "$gconfig_cv_cxx_constexpr" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_CONSTEXPR 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_CONSTEXPR 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ class enums" >&5
-$as_echo_n "checking for c++ class enums... " >&6; }
-if ${gconfig_cv_cxx_enum_class+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			enum class Type { t1 , t2 } ;
-			Type t = Type::t1 ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_enum_class=yes
-else
-  gconfig_cv_cxx_enum_class=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_enum_class" >&5
-$as_echo "$gconfig_cv_cxx_enum_class" >&6; }
-	if test "$gconfig_cv_cxx_enum_class" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_ENUM_CLASS 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_ENUM_CLASS 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ noexcept" >&5
-$as_echo_n "checking for c++ noexcept... " >&6; }
-if ${gconfig_cv_cxx_noexcept+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			void fn() noexcept ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_noexcept=yes
-else
-  gconfig_cv_cxx_noexcept=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_noexcept" >&5
-$as_echo "$gconfig_cv_cxx_noexcept" >&6; }
-	if test "$gconfig_cv_cxx_noexcept" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_NOEXCEPT 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_NOEXCEPT 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ override" >&5
-$as_echo_n "checking for c++ override... " >&6; }
-if ${gconfig_cv_cxx_override+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#if defined(__GNUC__) && __cplusplus < 200000L
-			#error gcc is too noisy when using override/final without std=c++11
-			#endif
-			struct base { virtual void fn() {} } ;
-			struct derived : public base { virtual void fn() override {} } ;
-			derived d ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_override=yes
-else
-  gconfig_cv_cxx_override=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_override" >&5
-$as_echo "$gconfig_cv_cxx_override" >&6; }
-	if test "$gconfig_cv_cxx_override" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_OVERRIDE 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_OVERRIDE 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ final keyword" >&5
-$as_echo_n "checking for c++ final keyword... " >&6; }
-if ${gconfig_cv_cxx_final+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#if defined(__GNUC__) && __cplusplus < 200000L
-			#error gcc is too noisy when using override/final without std=c++11
-			#endif
-			struct base { virtual void fn() {} } ;
-			struct derived : public base { virtual void fn() final {} } ;
-			derived d ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_final=yes
-else
-  gconfig_cv_cxx_final=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_final" >&5
-$as_echo "$gconfig_cv_cxx_final" >&6; }
-	if test "$gconfig_cv_cxx_final" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_FINAL 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_FINAL 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ type_traits" >&5
-$as_echo_n "checking for c++ type_traits... " >&6; }
-if ${gconfig_cv_cxx_type_traits_make_unsigned+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <type_traits>
-			std::make_unsigned<int>::type i = 0U ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_type_traits_make_unsigned=yes
-else
-  gconfig_cv_cxx_type_traits_make_unsigned=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_type_traits_make_unsigned" >&5
-$as_echo "$gconfig_cv_cxx_type_traits_make_unsigned" >&6; }
-	if test "$gconfig_cv_cxx_type_traits_make_unsigned" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ emplace_back and friends" >&5
-$as_echo_n "checking for c++ emplace_back and friends... " >&6; }
-if ${gconfig_cv_cxx_emplace+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <vector>
-			std::vector<int> v ;
-
-int
-main ()
-{
-
-			v.emplace_back(1) ;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_emplace=yes
-else
-  gconfig_cv_cxx_emplace=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_emplace" >&5
-$as_echo "$gconfig_cv_cxx_emplace" >&6; }
-	if test "$gconfig_cv_cxx_emplace" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_EMPLACE 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_EMPLACE 0" >>confdefs.h
-
-	fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ std::align" >&5
 $as_echo_n "checking for c++ std::align... " >&6; }
@@ -6936,90 +6660,6 @@ $as_echo "#define GCONFIG_HAVE_CXX_ALIGNMENT 0" >>confdefs.h
 
 	fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ std::move" >&5
-$as_echo_n "checking for c++ std::move... " >&6; }
-if ${gconfig_cv_cxx_move+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <utility>
-			struct X {} x ;
-			void fn( X&& ) ;
-
-int
-main ()
-{
-
-			fn( std::move(x) ) ;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_move=yes
-else
-  gconfig_cv_cxx_move=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_move" >&5
-$as_echo "$gconfig_cv_cxx_move" >&6; }
-	if test "$gconfig_cv_cxx_move" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_MOVE 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_MOVE 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ std::shared_ptr and friends" >&5
-$as_echo_n "checking for c++ std::shared_ptr and friends... " >&6; }
-if ${gconfig_cv_cxx_std_shared_ptr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <memory>
-			typedef std::shared_ptr<int> ptr ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_std_shared_ptr=yes
-else
-  gconfig_cv_cxx_std_shared_ptr=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_std_shared_ptr" >&5
-$as_echo "$gconfig_cv_cxx_std_shared_ptr" >&6; }
-	if test "$gconfig_cv_cxx_std_shared_ptr" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_SHARED_PTR 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_SHARED_PTR 0" >>confdefs.h
-
-	fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ std::make_unique" >&5
 $as_echo_n "checking for c++ std::make_unique... " >&6; }
 if ${gconfig_cv_cxx_std_make_unique+:} false; then :
@@ -7189,188 +6829,6 @@ $as_echo "#define GCONFIG_HAVE_CXX_STD_THREAD 0" >>confdefs.h
 	fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ std::wstring" >&5
-$as_echo_n "checking for c++ std::wstring... " >&6; }
-if ${gconfig_cv_cxx_std_wstring+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <string>
-			std::wstring ws;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_std_wstring=yes
-else
-  gconfig_cv_cxx_std_wstring=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_std_wstring" >&5
-$as_echo "$gconfig_cv_cxx_std_wstring" >&6; }
-	if test "$gconfig_cv_cxx_std_wstring" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_STD_WSTRING 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_STD_WSTRING 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ eq delete" >&5
-$as_echo_n "checking for c++ eq delete... " >&6; }
-if ${gconfig_cv_cxx_deleted+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#if defined(__GNUC__) && __cplusplus < 200000L
-			#error gcc is too noisy when using =delete without std=c++11
-			#endif
-			struct X { X(const X&) = delete ; } ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_deleted=yes
-else
-  gconfig_cv_cxx_deleted=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_deleted" >&5
-$as_echo "$gconfig_cv_cxx_deleted" >&6; }
-	if test "$gconfig_cv_cxx_deleted" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_DELETED 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_DELETED 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ eq default" >&5
-$as_echo_n "checking for c++ eq default... " >&6; }
-if ${gconfig_cv_cxx_defaulted+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#if defined(__GNUC__) && __cplusplus < 200000L
-			#error gcc is too noisy when using =delete without std=c++11
-			#endif
-			struct X { X() = default ; } ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_defaulted=yes
-else
-  gconfig_cv_cxx_defaulted=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_defaulted" >&5
-$as_echo "$gconfig_cv_cxx_defaulted" >&6; }
-	if test "$gconfig_cv_cxx_defaulted" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_DEFAULTED 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_DEFAULTED 0" >>confdefs.h
-
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ initializer_list" >&5
-$as_echo_n "checking for c++ initializer_list... " >&6; }
-if ${gconfig_cv_cxx_initializer_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <initializer_list>
-			struct X { X( std::initializer_list<int> ) {} } ;
-
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gconfig_cv_cxx_initializer_list=yes
-else
-  gconfig_cv_cxx_initializer_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_cxx_initializer_list" >&5
-$as_echo "$gconfig_cv_cxx_initializer_list" >&6; }
-	if test "$gconfig_cv_cxx_initializer_list" = "yes" ; then
-
-$as_echo "#define GCONFIG_HAVE_CXX_INITIALIZER_LIST 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_HAVE_CXX_INITIALIZER_LIST 0" >>confdefs.h
-
-	fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -7698,7 +7156,7 @@ int
 main ()
 {
 
-			int fd = socket( PF_ROUTE , SOCK_RAW , AF_INET ) ;
+			(void) socket( PF_ROUTE , SOCK_RAW , AF_INET ) ;
 			header1.rtm_msglen = header2.ifam_msglen = 0 ;
 			header1.rtm_type = RTM_ADD ;
 			header2.ifam_type = RTM_NEWADDR ;
@@ -7880,6 +7338,53 @@ $as_echo "#define GCONFIG_HAVE_GAISTRERROR 0" >>confdefs.h
 
 	fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
+$as_echo_n "checking for unix domain sockets... " >&6; }
+if ${gconfig_cv_uds+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#include <sys/types.h>
+			#include <sys/socket.h>
+			#include <sys/un.h>
+			struct sockaddr_un a ;
+
+int
+main ()
+{
+
+			a.sun_family = AF_UNIX | PF_UNIX ;
+			a.sun_path[0] = '\0' ;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  gconfig_cv_uds=yes
+else
+  gconfig_cv_uds=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_uds" >&5
+$as_echo "$gconfig_cv_uds" >&6; }
+	if test "$gconfig_cv_uds" = "yes"
+	then
+
+$as_echo "#define GCONFIG_HAVE_UDS 1" >>confdefs.h
+
+	else
+
+$as_echo "#define GCONFIG_HAVE_UDS 0" >>confdefs.h
+
+	fi
+
+
 
 
 
@@ -8068,6 +7573,44 @@ $as_echo "#define GCONFIG_HAVE_GETGRNAM_R 0" >>confdefs.h
 
 	fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext" >&5
+$as_echo_n "checking for gettext... " >&6; }
+if ${gconfig_cv_gettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#include <libintl.h>
+			const char * p = 0;
+			const char * dir = 0;
+			const char * md = 0;
+
+int
+main ()
+{
+
+			p = gettext( "foo" );
+			dir = bindtextdomain( "foo" , "bar" );
+			md = textdomain( "foo" );
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  gconfig_cv_gettext=yes
+else
+  gconfig_cv_gettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_gettext" >&5
+$as_echo "$gconfig_cv_gettext" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmtime_r" >&5
 $as_echo_n "checking for gmtime_r... " >&6; }
 if ${gconfig_cv_gmtime_r+:} false; then :
@@ -8794,6 +8337,7 @@ else
 /* end confdefs.h.  */
 
 			#include <csignal>
+			#include <cstddef>
 			sigset_t set ;
 			int rc ;
 
@@ -8803,7 +8347,7 @@ main ()
 
 			sigemptyset( &set ) ;
 			sigaddset( &set , SIGTERM ) ;
-			rc = sigprocmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , &set ) ;
+			rc = sigprocmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , NULL ) ;
 
   ;
   return 0;
@@ -8839,6 +8383,7 @@ else
 /* end confdefs.h.  */
 
 			#include <csignal>
+			#include <cstddef>
 			sigset_t set ;
 			int rc ;
 
@@ -8848,7 +8393,7 @@ main ()
 
 			sigemptyset( &set ) ;
 			sigaddset( &set , SIGTERM ) ;
-			rc = pthread_sigmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , &set ) ;
+			rc = pthread_sigmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , NULL ) ;
 
   ;
   return 0;
@@ -9041,6 +8586,8 @@ $as_echo "#define GCONFIG_HAVE_WINDOWS_INIT_COMMON_CONTROLS_EX 0" >>confdefs.h
 
 
 
+
+# if the configure script fails in this area then you are probably missing pkg.m4
 
 
 
@@ -9162,7 +8709,8 @@ $as_echo "no" >&6; }
 	fi
 fi
 
-	# try pkg-config
+
+	# try pkg-config -- this says 'checking for QT'
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5
@@ -9248,23 +8796,36 @@ $as_echo "yes" >&6; }
 fi
 
 	# allow the moc command to be defined with QT_MOC on the configure
-	# command-line, typically with CXXFLAGS and LIBS pointing to Qt
+	# command-line, typically also with CXXFLAGS and LIBS pointing to Qt
 	# headers and libraries
 
 
+	if echo "$QT_MOC" | grep -q /
+	then
+		QT_LRELEASE="`dirname \"$QT_MOC\"`/lrelease"
+	else
+		QT_LRELEASE="lrelease"
+	fi
+
 	# or build the moc command using pkg-config results
 	if test "$QT_MOC" = ""
 	then
 		if test "$gconfig_pkgconfig_qt" = "yes"
 		then
 			QT_MOC="`$PKG_CONFIG --variable=host_bins Qt5Core`/moc"
+			QT_LRELEASE="`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease"
 			QT_CHOOSER="`$PKG_CONFIG --variable=exec_prefix Qt5Core`/bin/qtchooser"
 			if test -x "$QT_MOC" ; then : ; else QT_MOC="" ; fi
+			if test -x "$QT_LRELEASE" ; then : ; else QT_LRELEASE="" ; fi
 			if test -x "$QT_CHOOSER" ; then : ; else QT_CHOOSER="" ; fi
 			if test "$QT_MOC" = "" -a "$QT_CHOOSER" != ""
 			then
 				QT_MOC="$QT_CHOOSER -run-tool=moc -qt=qt5"
 			fi
+			if test "$QT_LRELEASE" = "" -a "$QT_CHOOSER" != ""
+			then
+				QT_LRELEASE="$QT_CHOOSER -run-tool=lrelease -qt=qt5"
+			fi
 		fi
 	fi
 
@@ -9313,6 +8874,60 @@ fi
 
 	fi
 
+	if test "$QT_LRELEASE" = ""
+	then
+		# Extract the first word of "lrelease", so it can be a program name with args.
+set dummy lrelease; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_QT_LRELEASE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $QT_LRELEASE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_QT_LRELEASE="$QT_LRELEASE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_QT_LRELEASE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+QT_LRELEASE=$ac_cv_path_QT_LRELEASE
+if test -n "$QT_LRELEASE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_LRELEASE" >&5
+$as_echo "$QT_LRELEASE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test "$QT_LRELEASE" = ""
+		then
+			QT_LRELEASE=false
+		fi
+	fi
+
+	if test "$QT_MOC" != ""
+	then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: QT moc command: $QT_MOC" >&5
+$as_echo "$as_me: QT moc command: $QT_MOC" >&6;}
+	fi
+
 	# set gconfig_have_qt, QT_CFLAGS and QT_LIBS iff we have a moc command
 	if test "$QT_MOC" != ""
 	then
@@ -9337,6 +8952,57 @@ fi
 		QT_LIBS="-F $QT_DIR/lib -framework QtWidgets -framework QtGui -framework QtCore"
 	fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT compilation" >&5
+$as_echo_n "checking for QT compilation... " >&6; }
+if ${gconfig_cv_qt_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	if test "$gconfig_have_qt" = "yes"
+	then
+		gconfig_save_LIBS="$LIBS"
+		gconfig_save_CXXFLAGS="$CXXFLAGS"
+		LIBS="$LIBS $QT_LIBS"
+		CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+				#include <QtCore/QtCore>
+				#if QT_VERSION < 0x050000
+				#error Qt is too old
+				#endif
+				#include <QtGui/QtGui>
+				#include <QtWidgets/QtWidgets>
+				#include <QtCore/QtPlugin>
+
+int
+main ()
+{
+
+				throw QSize(1,1).width() ;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  gconfig_cv_qt_build=yes
+else
+  gconfig_cv_qt_build=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		LIBS="$gconfig_save_LIBS"
+		CXXFLAGS="$gconfig_save_CXXFLAGS"
+	else
+		gconfig_cv_qt_build=no
+	fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gconfig_cv_qt_build" >&5
+$as_echo "$gconfig_cv_qt_build" >&6; }
+	gconfig_qt_build="$gconfig_cv_qt_build"
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
 $as_echo_n "checking for openssl... " >&6; }
 if ${gconfig_cv_ssl_openssl+:} false; then :
@@ -9545,128 +9211,6 @@ $as_echo "#define GCONFIG_HAVE_MBEDTLS_NET_H 0" >>confdefs.h
 	fi
 
 
-# if the configure script fails in this area then you are probably missing pkg.m4
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
 
 # Check whether --enable-bsd was given.
 if test "${enable_bsd+set}" = set; then :
@@ -9748,30 +9292,36 @@ fi
 
 	if test "$enable_gui" = "no"
 	then
-		QT_MOC=""
-	fi
-
-	if test "$enable_gui" = "yes"
+		gconfig_gui="no"
+	:
+	elif test "$enable_gui" = "yes"
 	then
+		gconfig_gui="yes"
 		if test "$gconfig_have_qt" = "no"
 		then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring --enable-gui: set QT_MOC to override" >&5
-$as_echo "$as_me: WARNING: ignoring --enable-gui: set QT_MOC to override" >&2;}
-			QT_MOC=""
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gui enabled but no qt tools found" >&5
+$as_echo "$as_me: WARNING: gui enabled but no qt tools found" >&2;}
+		fi
+		if test "$gconfig_qt_build" = "no"
+		then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gui enabled but qt does not compile" >&5
+$as_echo "$as_me: WARNING: gui enabled but qt does not compile" >&2;}
+		fi
+	:
+	else
+		if test "$gconfig_have_qt" = "yes" -a "$gconfig_qt_build" = "yes"
+		then
+			gconfig_gui="yes"
+		else
+			gconfig_gui="no"
 		fi
 	fi
 
-	if test "$enable_gui" != "no" -a "$QT_MOC" = ""
+	if test "$gconfig_gui" = "no" -a "$enable_gui" != "no"
 	then
 		gconfig_warnings="$gconfig_warnings qt_graphical_user_interface"
 	fi
 
-	if test "$QT_MOC" != ""
-	then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: QT moc command: $QT_MOC" >&5
-$as_echo "$as_me: QT moc command: $QT_MOC" >&6;}
-	fi
-
 	GCONFIG_QT_LIBS=$QT_LIBS
 
 	GCONFIG_QT_CFLAGS=$QT_CFLAGS
@@ -9779,7 +9329,7 @@ $as_echo "$as_me: QT moc command: $QT_MOC" >&6;}
 	GCONFIG_QT_MOC=$QT_MOC
 
 
-	 if test "$QT_MOC" != ""; then
+	 if test "$gconfig_gui" = "yes"; then
   GCONFIG_GUI_TRUE=
   GCONFIG_GUI_FALSE='#'
 else
@@ -10005,14 +9555,21 @@ if test "${with_gettext+set}" = set; then :
 fi
 
 
-	if test "$with_gettext" = "yes"
+	if test "$with_gettext" = "no"
 	then
-		gconfig_use_gettext="yes"
-	else
-		gconfig_use_gettext="no"
+		gconfig_cv_gettext="no"
+	:
+	elif test "$with_gettext" = "yes"
+	then
+		if test "$gconfig_cv_gettext" = "no"
+		then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: forcing use of gettext even though not detected" >&5
+$as_echo "$as_me: WARNING: forcing use of gettext even though not detected" >&2;}
+			gconfig_cv_gettext="yes"
+		fi
 	fi
 
-	if test "$gconfig_use_gettext" = "yes" ; then
+	if test "$gconfig_cv_gettext" = "yes" ; then
 
 $as_echo "#define GCONFIG_HAVE_GETTEXT 1" >>confdefs.h
 
@@ -10021,6 +9578,14 @@ $as_echo "#define GCONFIG_HAVE_GETTEXT 1" >>confdefs.h
 $as_echo "#define GCONFIG_HAVE_GETTEXT 0" >>confdefs.h
 
 	fi
+	 if test "$gconfig_cv_gettext" = "yes"; then
+  GCONFIG_GETTEXT_TRUE=
+  GCONFIG_GETTEXT_FALSE='#'
+else
+  GCONFIG_GETTEXT_TRUE='#'
+  GCONFIG_GETTEXT_FALSE=
+fi
+
 
 
 # Check whether --with-man2html was given.
@@ -10080,6 +9645,8 @@ fi
 		gconfig_ssl_notice="openssl and mbedtls"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=yes
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS="$gconfig_ssl_mbedtls_libs $gconfig_ssl_openssl_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "yes" -a "$gconfig_ssl_use_mbedtls" = "no"
@@ -10087,6 +9654,8 @@ fi
 		gconfig_ssl_notice="openssl"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=yes
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS="$gconfig_ssl_openssl_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "no" -a "$gconfig_ssl_use_mbedtls" = "yes"
@@ -10094,6 +9663,8 @@ fi
 		gconfig_ssl_notice="mbedtls"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=yes
 		GCONFIG_TLS_LIBS="$gconfig_ssl_mbedtls_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "no" -a "$gconfig_ssl_use_mbedtls" = "no"
@@ -10101,6 +9672,8 @@ fi
 		gconfig_ssl_notice="none"
 		gconfig_ssl_use_none=yes
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS=""
 	fi
 
@@ -10118,7 +9691,7 @@ else
   GCONFIG_TLS_USE_BOTH_FALSE=
 fi
 
-	 if test "$gconfig_ssl_use_openssl" = "yes"; then
+	 if test "$gconfig_ssl_use_openssl_only" = "yes"; then
   GCONFIG_TLS_USE_OPENSSL_TRUE=
   GCONFIG_TLS_USE_OPENSSL_FALSE='#'
 else
@@ -10126,7 +9699,7 @@ else
   GCONFIG_TLS_USE_OPENSSL_FALSE=
 fi
 
-	 if test "$gconfig_ssl_use_mbedtls" = "yes"; then
+	 if test "$gconfig_ssl_use_mbedtls_only" = "yes"; then
   GCONFIG_TLS_USE_MBEDTLS_TRUE=
   GCONFIG_TLS_USE_MBEDTLS_FALSE='#'
 else
@@ -10491,6 +10064,40 @@ fi
 
 
 
+# Check whether --with-uds was given.
+if test "${with_uds+set}" = set; then :
+  withval=$with_uds;
+fi
+
+
+
+	if test "$with_uds" = "no"
+	then
+		 if false; then
+  GCONFIG_UDS_TRUE=
+  GCONFIG_UDS_FALSE='#'
+else
+  GCONFIG_UDS_TRUE='#'
+  GCONFIG_UDS_FALSE=
+fi
+
+	else
+		if test "$with_uds" = "yes" -a "$gconfig_cv_uds" = "no"
+		then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: forcing use of unix domain sockets even though not detected" >&5
+$as_echo "$as_me: WARNING: forcing use of unix domain sockets even though not detected" >&2;}
+		fi
+		 if true; then
+  GCONFIG_UDS_TRUE=
+  GCONFIG_UDS_FALSE='#'
+else
+  GCONFIG_UDS_TRUE='#'
+  GCONFIG_UDS_FALSE=
+fi
+
+	fi
+
+
 
 	if test "$e_libexecdir" = ""
 	then
@@ -10537,6 +10144,10 @@ fi
 	then
 		e_icondir="$datadir/$PACKAGE"
 	fi
+	if test "$e_trdir" = ""
+	then
+		e_trdir="$datadir/$PACKAGE"
+	fi
 	if test "$e_rundir" = ""
 	then
 		# (linux fhs says "/run", not "/var/run")
@@ -10562,6 +10173,7 @@ fi
 
 
 
+
 ac_config_files="$ac_config_files Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gauth/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/main/icon/Makefile src/win32/Makefile src/gui/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile test/certificates/Makefile m4/Makefile bsd/Makefile debian/Makefile po/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10741,6 +10353,10 @@ if test -z "${GCONFIG_WINDOWS_TRUE}" && test -z "${GCONFIG_WINDOWS_FALSE}"; then
   as_fn_error $? "conditional \"GCONFIG_WINDOWS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GCONFIG_GETTEXT_TRUE}" && test -z "${GCONFIG_GETTEXT_FALSE}"; then
+  as_fn_error $? "conditional \"GCONFIG_GETTEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GCONFIG_TLS_USE_BOTH_TRUE}" && test -z "${GCONFIG_TLS_USE_BOTH_FALSE}"; then
   as_fn_error $? "conditional \"GCONFIG_TLS_USE_BOTH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -10761,6 +10377,14 @@ if test -z "${GCONFIG_PAM_TRUE}" && test -z "${GCONFIG_PAM_FALSE}"; then
   as_fn_error $? "conditional \"GCONFIG_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GCONFIG_UDS_TRUE}" && test -z "${GCONFIG_UDS_FALSE}"; then
+  as_fn_error $? "conditional \"GCONFIG_UDS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GCONFIG_UDS_TRUE}" && test -z "${GCONFIG_UDS_FALSE}"; then
+  as_fn_error $? "conditional \"GCONFIG_UDS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -11158,7 +10782,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by E-MailRelay $as_me 2.2, which was
+This file was extended by E-MailRelay $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11224,7 +10848,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-E-MailRelay config.status 2.2
+E-MailRelay config.status 2.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -11343,7 +10967,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 _ACEOF
 
@@ -11353,7 +10977,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "gconfig_defs.h") CONFIG_HEADERS="$CONFIG_HEADERS gconfig_defs.h" ;;
+    "src/gconfig_defs.h") CONFIG_HEADERS="$CONFIG_HEADERS src/gconfig_defs.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -11975,29 +11599,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -12015,53 +11645,48 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)[^/].*/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
 
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index 79ca098..d04917d
--- a/configure.ac
+++ b/configure.ac
@@ -19,11 +19,11 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT([E-MailRelay],[2.2],[],[emailrelay])
+AC_INIT([E-MailRelay],[2.2.1],[],[emailrelay])
 AC_CONFIG_SRCDIR([src/glib/gdef.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([no-define])
-AC_CONFIG_HEADERS([gconfig_defs.h])
+AC_CONFIG_HEADERS([src/gconfig_defs.h])
 AM_MAINTAINER_MODE
 AC_DISABLE_OPTION_CHECKING
 
@@ -59,17 +59,18 @@ GCONFIG_FN_CHECK_CXX
 GCONFIG_FN_CHECK_NET
 GCONFIG_FN_CHECK_FUNCTIONS
 
-dnl check for packages
-dnl
-GCONFIG_FN_QT
-GCONFIG_FN_TLS_OPENSSL
-GCONFIG_FN_TLS_MBEDTLS
-
 dnl initialise aclocal/pkg.m4
 dnl
 # if the configure script fails in this area then you are probably missing pkg.m4
 PKG_PROG_PKG_CONFIG([0.9.0])
 
+dnl check for packages
+dnl
+GCONFIG_FN_QT
+GCONFIG_FN_QT_BUILD
+GCONFIG_FN_TLS_OPENSSL
+GCONFIG_FN_TLS_MBEDTLS
+
 dnl possibly enable full gettext support -- uncomment this after running
 dnl 'gettextize' and remove the other gettext lines below
 dnl
@@ -115,6 +116,8 @@ AC_ARG_WITH([mbedtls],AS_HELP_STRING([--with-mbedtls],[use mbedtls for tls layer
 GCONFIG_FN_TLS
 AC_ARG_WITH([pam],AS_HELP_STRING([--with-pam],[use linux pam for authentication (default auto)]))
 GCONFIG_FN_WITH_PAM
+AC_ARG_WITH([uds],AS_HELP_STRING([--with-uds],[enable unix domain sockets (default auto)]))
+GCONFIG_FN_WITH_UDS
 
 dnl directory tweaking -- define e_ prefixed directory variables
 dnl
diff --git a/configure.sh b/configure.sh
index 274bb61..a26b2d1 100755
--- a/configure.sh
+++ b/configure.sh
@@ -22,13 +22,15 @@
 # directories depending on the host environment and simplifies
 # cross-compilation.
 #
-# usage: configure.sh [-g] [{-d|-s <>}] [{-o|-m|-p}] -- [<configure-options>]
-#         -d  add debug compiler flags
-#         -s  add sanitiser compiler flags (eg. -s address)
-#         -o  cross-compile for openwrt (edit as required)
-#         -m  cross-compile for windows with mingw-w64
-#         -p  cross-compile for rpi
-#         -g  git-clone mbedtls
+# usage: configure.sh [-g] [{-d|-s <>}] [{-o|-w|-p}] -- [<configure-options>]
+#         -d   add debug compiler flags
+#         -s   add sanitiser compiler flags (eg. -s address)
+#         -o   cross-compile for openwrt (edit as required)
+#         -w   cross-compile for windows 32-bit with mingw-w64
+#         -w32 cross-compile for windows 32-bit with mingw-w64
+#         -w64 cross-compile for windows 64-bit with mingw-w64
+#         -p   cross-compile for rpi
+#         -g   git-clone mbedtls and exit
 #
 # For systemd add "e_systemddir=/usr/lib/systemd/system".
 #
@@ -39,16 +41,18 @@
 
 thisdir="`cd \`dirname $0\` && pwd`"
 
-usage="[-g] [{-d|-s <>}] [{-o|-m|-p}] -- <configure-args>"
+usage="[-g] [{-d|-s <>}] [{-o|-w|-p}] -- <configure-args>"
 while expr "x$1" : "x-" >/dev/null
 do
 	valued=0
-	case "`echo \"$1\" | sed 's/^-//'`" in
+	case "`echo \"$1\" | sed 's/^--*//'`" in
 		g) opt_git=1 ;;
 		d) opt_debug=1 ;;
 		s) opt_sanitise="$2" ; valued=1 ;;
 		o) opt_openwrt=1 ;;
-		m) opt_mingw=1 ;;
+		w) opt_mingw=1 ; opt_win=32 ;;
+		w32) opt_mingw=1 ; opt_win=32 ;;
+		w64) opt_mingw=1 ; opt_win=64 ;;
 		p) opt_rpi=1 ;;
 		h) echo usage: `basename $0` $usage "..." ; $thisdir/configure --help=short ; exit 0 ;;
 		#\?) echo usage: `basename $0` $usage >&2 ; exit 2 ;;
@@ -71,6 +75,14 @@ fi
 if test "0$opt_git" -eq 1
 then
 	git clone https://salsa.debian.org/debian/mbedtls.git
+	e="$?"
+	sed -i 's/defined._TRUNCATE./0/' mbedtls/library/platform.c
+	if test "$e" -eq 0 -a "0$opt_mingw" -eq 0
+	then
+		echo build with...
+		echo "  make -C mbedtls/library WINDOWS=0"
+	fi
+	exit "$e"
 fi
 
 enable_debug=""
@@ -114,7 +126,12 @@ fi
 
 if test "0$opt_mingw" -eq 1
 then
-	TARGET="i686-w64-mingw32"
+	if test "$opt_win" -eq 32
+	then
+		TARGET="i686-w64-mingw32" # 32-bit binaries
+	else
+		TARGET="x86_64-w64-mingw32" # 64-bit binaries
+	fi
 	export CXX="$TARGET-g++-posix"
 	export CC="$TARGET-gcc-posix"
 	export AR="$TARGET-ar"
diff --git a/debian/Makefile.in b/debian/Makefile.in
index 1d086f6..05c388a 100644
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -185,6 +185,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -221,6 +222,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -281,8 +283,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -300,7 +302,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/debian/changelog b/debian/changelog
index 802f1c3..293fd35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emailrelay (2.2.1) unstable; urgency=low
+  * Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+  * Windows event log not used for verbose logging (prefer "--log-file").
+  * New admin 'forward' command to trigger forwarding without waiting.
+  * Support for MbedTLS version 3.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 14 Feb 2022 00:00:00 +0000
+
 emailrelay (2.2) unstable; urgency=low
   * Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
   * Interface names can be used with "--interface" (eg. "--interface=eth0").
diff --git a/debian/emailrelay.service b/debian/emailrelay.service
index da16a1e..52a519e 100644
--- a/debian/emailrelay.service
+++ b/debian/emailrelay.service
@@ -12,3 +12,7 @@ ExecStart=/etc/init.d/emailrelay start
 ExecStop=/etc/init.d/emailrelay stop
 PIDFile=/run/emailrelay/emailrelay.pid
 SuccessExitStatus=0 143
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/debian/postinst b/debian/postinst
old mode 100755
new mode 100644
diff --git a/debian/postrm b/debian/postrm
old mode 100755
new mode 100644
diff --git a/debian/preinst b/debian/preinst
old mode 100755
new mode 100644
diff --git a/debian/prerm b/debian/prerm
old mode 100755
new mode 100644
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3b774fb..5557800 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -100,7 +100,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
@@ -220,6 +220,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -256,6 +257,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -372,8 +374,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -453,7 +455,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/doc/changelog.html b/doc/changelog.html
index 004af99..a11da41 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -8,8 +8,15 @@
  <body>
   <!-- index:0::::E-MailRelay Change Log -->
  <div class="div-main">
-  <h1><a class="a-header" name="H_1">E-MailRelay Change Log</a></h1> <!-- index:1:H:1::E-MailRelay Change Log -->
-   <h2><a class="a-header" name="SH_1_1">2.1 -> 2.2</a></h2> <!-- index:2:SH:1:1:2.1 -> 2.2 -->
+  <h1><a class="a-header" name="H_1">E-MailRelay Change Log</a></h1> <!-- index:1:H:E-MailRelay Change Log -->
+   <h2><a class="a-header" name="SH_1_1">2.2 -> 2.2.1</a></h2> <!-- index:2:SH:1:1:2.2 -> 2.2.1 -->
+    <ul>
+     <li>Unix domain sockets supported (eg. <em>--interface=/tmp/smtp.s</em>.</li>
+     <li>Windows event log not used for verbose logging (prefer <em>--log-file</em>).</li>
+     <li>New admin <em>forward</em> command to trigger forwarding without waiting.</li>
+     <li>Support for MbedTLS version 3.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_2">2.1 -> 2.2</a></h2> <!-- index:2:SH:1:2:2.1 -> 2.2 -->
     <ul>
      <li>Connections from IPv4 'private use' addresses are allowed by default (see <em>--remote-clients</em>).</li>
      <li>Interface names can be used with <em>--interface</em> (eg. <em>--interface=eth0</em>).</li>
@@ -25,14 +32,14 @@
      <li>Support for Windows XP restored when built with mingw-w64.</li>
      <li>C++ 2011 compiler is required.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_2">2.0.1 -> 2.1</a></h2> <!-- index:2:SH:1:2:2.0.1 -> 2.1 -->
+   <h2><a class="a-header" name="SH_1_3">2.0.1 -> 2.1</a></h2> <!-- index:2:SH:1:3:2.0.1 -> 2.1 -->
     <ul>
      <li>Backwards compatibility features for 1.9-to-2.0 transition removed.</li>
      <li>Better handling of too-many-connections on Windows.</li>
      <li>New <em>--idle-timeout</em> option for server-side connections.</li>
      <li>Support for RFC-5782 DNSBL blocking (<em>--dnsbl</em>).</li>
      <li>Filter scripts are given the path of the envelope file in argv2.</li>
-     <li>Message files can be editied by <em>--client-filter</em> scripts.</li>
+     <li>Message files can be edited by <em>--client-filter</em> scripts.</li>
      <li>Better support for CRAM-SHAx authentication.</li>
      <li>New <em>--client-auth-config</em> and <em>--server-auth-config</em> options.</li>
      <li>New <em>--show</em> option on windows to better control the user interface style.</li>
@@ -42,11 +49,11 @@
      <li>Certificate contents are not logged.</li>
      <li>Timestamp parts of spool filenames no longer limited to six digits.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_3">2.0 -> 2.0.1</a></h2> <!-- index:2:SH:1:3:2.0 -> 2.0.1 -->
+   <h2><a class="a-header" name="SH_1_4">2.0 -> 2.0.1</a></h2> <!-- index:2:SH:1:4:2.0 -> 2.0.1 -->
     <ul>
      <li>Make PLAIN client authentication work against servers with broken 334 responses.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_4">1.9.2 -> 2.0</a></h2> <!-- index:2:SH:1:4:1.9.2 -> 2.0 -->
+   <h2><a class="a-header" name="SH_1_5">1.9.2 -> 2.0</a></h2> <!-- index:2:SH:1:5:1.9.2 -> 2.0 -->
     <ul>
      <li>Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see <em>--interface</em>).</li>
      <li>Server process is not blocked during <em>--filter</em> or <em>--address-verifier</em> execution, if multi-threaded.</li>
@@ -77,7 +84,7 @@
      <li>C++ 2011 is preferred, and required for multi-threading.</li>
      <li>Support for very old versions of Windows is dropped.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_5">1.9.1 -> 1.9.2</a></h2> <!-- index:2:SH:1:5:1.9.1 -> 1.9.2 -->
+   <h2><a class="a-header" name="SH_1_6">1.9.1 -> 1.9.2</a></h2> <!-- index:2:SH:1:6:1.9.1 -> 1.9.2 -->
     <ul>
      <li>Fixed a leak in the event-loop garbage collection.</li>
      <li>A local hostname that fails to resolve is not an error.</li>
@@ -93,11 +100,11 @@
      <li>Qt4 or Qt5 selected by the <em>configure</em> script.</li>
      <li>Improved the RPM spec file.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_6">1.9 -> 1.9.1</a></h2> <!-- index:2:SH:1:6:1.9 -> 1.9.1 -->
+   <h2><a class="a-header" name="SH_1_7">1.9 -> 1.9.1</a></h2> <!-- index:2:SH:1:7:1.9 -> 1.9.1 -->
     <ul>
      <li>Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_7">1.8.2 -> 1.9</a></h2> <!-- index:2:SH:1:7:1.8.2 -> 1.9 -->
+   <h2><a class="a-header" name="SH_1_8">1.8.2 -> 1.9</a></h2> <!-- index:2:SH:1:8:1.8.2 -> 1.9 -->
     <ul>
      <li>Added negotiated TLS/SSL for POP (ie. <em>STLS</em>).</li>
      <li>The first two fields in the secrets files are reordered (with backwards compatibility).</li>
@@ -122,17 +129,17 @@
      <li>Added Windows <em>--peer-lookup</em> option.</li>
      <li>Fix for MD5 code in 64-bit builds.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_8">1.8.1 -> 1.8.2</a></h2> <!-- index:2:SH:1:8:1.8.1 -> 1.8.2 -->
+   <h2><a class="a-header" name="SH_1_9">1.8.1 -> 1.8.2</a></h2> <!-- index:2:SH:1:9:1.8.1 -> 1.8.2 -->
     <ul>
      <li>Fix namespaces for gcc 3.4.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_9">1.8 -> 1.8.1</a></h2> <!-- index:2:SH:1:9:1.8 -> 1.8.1 -->
+   <h2><a class="a-header" name="SH_1_10">1.8 -> 1.8.1</a></h2> <!-- index:2:SH:1:10:1.8 -> 1.8.1 -->
     <ul>
      <li>Changed the definition of <em>--as-proxy</em> to use <em>--poll 0</em> rather than <em>--immediate</em> [bug-id 1961652].</li>
      <li>Fixed stalling bug when using server-side TLS/SSL (<em>--server-tls</em>) [bug-id 1961655].</li>
      <li>Improved Debian packaging for Linux (<em>make deb</em>).</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_10">1.7 -> 1.8</a></h2> <!-- index:2:SH:1:10:1.7 -> 1.8 -->
+   <h2><a class="a-header" name="SH_1_11">1.7 -> 1.8</a></h2> <!-- index:2:SH:1:11:1.7 -> 1.8 -->
     <ul>
      <li>Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).</li>
      <li>Build-time size optimisations (eg. <em>./configure --disable-exec --enable-small-exceptions ...</em>).</li>
@@ -148,7 +155,7 @@
      <li>Improved native support for Mac OS X (10.5) with graphical installation from disk image.</li>
      <li>Compatibility with gcc 2.95 restored.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_11">1.6 -> 1.7</a></h2> <!-- index:2:SH:1:11:1.6 -> 1.7 -->
+   <h2><a class="a-header" name="SH_1_12">1.6 -> 1.7</a></h2> <!-- index:2:SH:1:12:1.6 -> 1.7 -->
     <ul>
      <li>TLS/SSL support for SMTP using OpenSSL (<em>./configure --with-openssl</em> with <em>--client-tls</em> and <em>--server-tls</em>).</li>
      <li>Authentication mechanism <em>PLAIN</em> added.</li>
@@ -156,7 +163,7 @@
      <li>Windows service wrapper has an <em>--uninstall</em> option.</li>
      <li>Windows installation GUI uninstalls the service before reinstalling it.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_12">1.5 -> 1.6</a></h2> <!-- index:2:SH:1:12:1.5 -> 1.6 -->
+   <h2><a class="a-header" name="SH_1_13">1.5 -> 1.6</a></h2> <!-- index:2:SH:1:13:1.5 -> 1.6 -->
     <ul>
      <li>GPLv3 licence (see <em>http://gplv3.fsf.org</em>).</li>
      <li>New <em>--prompt-timeout</em> switch for the timeout when waiting for the initial 220 prompt from the SMTP server.</li>
@@ -176,7 +183,7 @@
      <li>Experimental SpamAssassin spamc/spamd protocol support.</li>
      <li>Acceptance tests added to the distribution.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_13">1.4 -> 1.5</a></h2> <!-- index:2:SH:1:13:1.4 -> 1.5 -->
+   <h2><a class="a-header" name="SH_1_14">1.4 -> 1.5</a></h2> <!-- index:2:SH:1:14:1.4 -> 1.5 -->
     <ul>
      <li>New installation and configuration GUI using TrollTech Qt 4.x (<em>./configure --enable-gui</em>)</li>
      <li>Default address verifier accepts all addresses as valid and never treats them as local mailboxes.</li>
@@ -191,7 +198,7 @@
      <li>Documentation also created in docbook format (requires xmlto).</li>
      <li>Windows installation document revised.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_14">1.3.3 -> 1.4</a></h2> <!-- index:2:SH:1:14:1.3.3 -> 1.4 -->
+   <h2><a class="a-header" name="SH_1_15">1.3.3 -> 1.4</a></h2> <!-- index:2:SH:1:15:1.3.3 -> 1.4 -->
     <ul>
      <li>POP3 server (enable with <em>--pop</em>, disable at build-time with <em>./configure --disable-pop</em>).</li>
      <li>Fix for logging reentrancy bug (affects <em>./configure --enable-debug</em> with <em>--debug</em>).</li>
@@ -205,7 +212,7 @@
      <li>The <em>--dont-listen</em> switch is now <em>--no-smtp</em>.</li>
      <li>Better IPv6 support (Linux only).</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_15">1.3.2 -> 1.3.3</a></h2> <!-- index:2:SH:1:15:1.3.2 -> 1.3.3 -->
+   <h2><a class="a-header" name="SH_1_16">1.3.2 -> 1.3.3</a></h2> <!-- index:2:SH:1:16:1.3.2 -> 1.3.3 -->
     <ul>
      <li>No bind() for outgoing connections [bug-id 1051689].</li>
      <li>Updated rpm spec file [bug-id 1224850].</li>
@@ -214,21 +221,21 @@
      <li>Documentation of <em>auth</em> switches corrected.</li>
      <li>State-machine template type declaration modernised, possibly breaking older compilers.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_16">1.3.1 -> 1.3.2</a></h2> <!-- index:2:SH:1:16:1.3.1 -> 1.3.2 -->
+   <h2><a class="a-header" name="SH_1_17">1.3.1 -> 1.3.2</a></h2> <!-- index:2:SH:1:17:1.3.1 -> 1.3.2 -->
     <ul>
      <li>Fix for core dump when <em>--client-filter</em> pre-processing fails.</li>
      <li>Revised code structure to prepare for asynchronous pre-processing.</li>
      <li>Better diagnostics when pre-processor exec() fails.</li>
      <li>Better cleanup of empty and orphaned files.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_17">1.3 -> 1.3.1</a></h2> <!-- index:2:SH:1:17:1.3 -> 1.3.1 -->
+   <h2><a class="a-header" name="SH_1_18">1.3 -> 1.3.1</a></h2> <!-- index:2:SH:1:18:1.3 -> 1.3.1 -->
     <ul>
      <li>Windows resource leak from CreateProcess() fixed.</li>
      <li>Windows dialog box double-close fix.</li>
      <li>Some documentation for the <em>--scanner</em> switch.</li>
      <li>New usage patterns section in the user guide.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_18">1.2 -> 1.3</a></h2> <!-- index:2:SH:1:18:1.2 -> 1.3 -->
+   <h2><a class="a-header" name="SH_1_19">1.2 -> 1.3</a></h2> <!-- index:2:SH:1:19:1.2 -> 1.3 -->
     <ul>
      <li>Client protocol waits for a greeting from the server on startup [bug-id 842156].</li>
      <li>Fix for incorrect backslash normalisation on <em>--verifier</em> command-lines containing spaces [bug-id 890646].</li>
@@ -241,7 +248,7 @@
      <li>New switches for the <em>configure</em> script.</li>
      <li>More JavaScript example scripts.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_19">1.1.2 -> 1.2</a></h2> <!-- index:2:SH:1:19:1.1.2 -> 1.2 -->
+   <h2><a class="a-header" name="SH_1_20">1.1.2 -> 1.2</a></h2> <!-- index:2:SH:1:20:1.1.2 -> 1.2 -->
     <ul>
      <li>The <em>--filter</em> and <em>--verifier</em> arguments interpreted as command-lines; spaces in executable paths now need escaping.</li>
      <li>The <em>--interface</em> switch applies to outgoing connections too.</li>
@@ -250,7 +257,7 @@
      <li>Fix for dangling reference bug, seen after <em>quit</em> command on Windows.</li>
      <li>JavaScript examples in the documentation.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_20">1.1.1 -> 1.1.2</a></h2> <!-- index:2:SH:1:20:1.1.1 -> 1.1.2 -->
+   <h2><a class="a-header" name="SH_1_21">1.1.1 -> 1.1.2</a></h2> <!-- index:2:SH:1:21:1.1.1 -> 1.1.2 -->
     <ul>
      <li>Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].</li>
      <li>Resolved the file-descriptor kludge for <em>--verifier</em> on Windows.</li>
@@ -259,7 +266,7 @@
      <li>Pre-processor (<em>--filter</em>) program's standard output searched for a failure reason string.</li>
      <li>Undocumented <em>--scanner</em> switch added for asynchronous processing by a separate network server.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_21">1.1.0 -> 1.1.1</a></h2> <!-- index:2:SH:1:21:1.1.0 -> 1.1.1 -->
+   <h2><a class="a-header" name="SH_1_22">1.1.0 -> 1.1.1</a></h2> <!-- index:2:SH:1:22:1.1.0 -> 1.1.1 -->
     <ul>
      <li>Restored the fix for building with gcc2.96.</li>
      <li>Support for MinGW builds on Windows.</li>
@@ -269,7 +276,7 @@
      <li>Fix for <em>make install</em> when <em>man2html</em> is not available.</li>
      <li>Updated init script.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_22">1.0.2 -> 1.1.0</a></h2> <!-- index:2:SH:1:22:1.0.2 -> 1.1.0 -->
+   <h2><a class="a-header" name="SH_1_23">1.0.2 -> 1.1.0</a></h2> <!-- index:2:SH:1:23:1.0.2 -> 1.1.0 -->
     <ul>
      <li>In proxy mode unexpected client-side disconnects and timeouts do not leave <em>.bad</em> files [see also bug-id 659039].</li>
      <li>By default proxy mode does not interpret addresses for local delivery (<em>--postmaster</em>).</li>
@@ -284,14 +291,14 @@
      <li>Support for Sun WorkShop 5.0 added.</li>
      <li>Documentation overhaul.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_23">1.0.0 -> 1.0.2</a></h2> <!-- index:2:SH:1:23:1.0.0 -> 1.0.2 -->
+   <h2><a class="a-header" name="SH_1_24">1.0.0 -> 1.0.2</a></h2> <!-- index:2:SH:1:24:1.0.0 -> 1.0.2 -->
     <ul>
      <li>Support for trusted IP addresses, allowing certain clients to avoid authentication.</li>
      <li>Address verifier interface extended to include authentication information.</li>
      <li>New public mail relay section added to the user guide.</li>
      <li>Example verifier scripts etc. added to the reference guide.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_24">1.0.0 -> 1.0.1</a></h2> <!-- index:2:SH:1:24:1.0.0 -> 1.0.1 -->
+   <h2><a class="a-header" name="SH_1_25">1.0.0 -> 1.0.1</a></h2> <!-- index:2:SH:1:25:1.0.0 -> 1.0.1 -->
     <ul>
      <li>In proxy mode unexpected client-side disconnects and timeouts result in <em>.bad</em> files [bug-id 659039].</li>
      <li>Require successful <em>AUTH</em> before <em>MAIL FROM</em> when using <em>--server-auth</em>.</li>
@@ -304,7 +311,7 @@
      <li>Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).</li>
      <li>Fix default spool directory in example scripts (1.0.0-pl1).</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_25">0.9.9 -> 1.0.0</a></h2> <!-- index:2:SH:1:25:0.9.9 -> 1.0.0 -->
+   <h2><a class="a-header" name="SH_1_26">0.9.9 -> 1.0.0</a></h2> <!-- index:2:SH:1:26:0.9.9 -> 1.0.0 -->
     <ul>
      <li>Briefer <em>--help</em> output; works with <em>--verbose</em>.</li>
      <li>Option to listen on a specific network interface (<em>--interface</em>).</li>
@@ -317,7 +324,7 @@
      <li>EHLO response parsing is now case-insensitive [bug-id 561522].</li>
      <li>Fewer missing-secrets warnings [bug-id 564987].</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_26">0.9.8 -> 0.9.9</a></h2> <!-- index:2:SH:1:26:0.9.8 -> 0.9.9 -->
+   <h2><a class="a-header" name="SH_1_27">0.9.8 -> 0.9.9</a></h2> <!-- index:2:SH:1:27:0.9.8 -> 0.9.9 -->
     <ul>
      <li>More flexible logging options (<em>--verbose</em> and <em>--debug</em> work better).</li>
      <li>File Hierarchy Standard (FHS) option for <em>configure</em> (<em>--enable-fhs</em>).</li>
@@ -333,14 +340,14 @@
      <li>Submit utility works under Windows. [rc2]</li>
      <li>Improved Windows project files. [rc2]</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_27">0.9.7 -> 0.9.8</a></h2> <!-- index:2:SH:1:27:0.9.7 -> 0.9.8 -->
+   <h2><a class="a-header" name="SH_1_28">0.9.7 -> 0.9.8</a></h2> <!-- index:2:SH:1:28:0.9.7 -> 0.9.8 -->
     <ul>
      <li>Fix for running pre-processor (<em>--filter</em>) as root.</li>
      <li>Ignore bogus <em>AUTH=LOGIN</em> lines in EHLO response.</li>
      <li>Submit utility improved to work with mutt.</li>
      <li>Installation of submit man page.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_28">0.9.6 -> 0.9.7</a></h2> <!-- index:2:SH:1:28:0.9.6 -> 0.9.7 -->
+   <h2><a class="a-header" name="SH_1_29">0.9.6 -> 0.9.7</a></h2> <!-- index:2:SH:1:29:0.9.6 -> 0.9.7 -->
     <ul>
      <li>CRAM-MD5 authentication mechanism added.</li>
      <li>Revoke root permissions at start up, and reclaim them when needed.</li>
@@ -356,7 +363,7 @@
      <li>Submission utility <em>emailrelay-submit</em> added.</li>
      <li>HTML4.0 compliant HTML documentation, using CSS.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_29">0.9.5 -> 0.9.6</a></h2> <!-- index:2:SH:1:29:0.9.5 -> 0.9.6 -->
+   <h2><a class="a-header" name="SH_1_30">0.9.5 -> 0.9.6</a></h2> <!-- index:2:SH:1:30:0.9.5 -> 0.9.6 -->
     <ul>
      <li>SMTP AUTHentication extension -- LOGIN mechanism only.</li>
      <li>Client-side protocol timeout.</li>
@@ -366,7 +373,7 @@
      <li>Multiple hard-coded listening addresses supported at compile-time.</li>
      <li>Fix for automatic reopening of stderr stream.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_30">0.9.4 -> 0.9.5</a></h2> <!-- index:2:SH:1:30:0.9.4 -> 0.9.5 -->
+   <h2><a class="a-header" name="SH_1_31">0.9.4 -> 0.9.5</a></h2> <!-- index:2:SH:1:31:0.9.4 -> 0.9.5 -->
     <p>
      Windows fixes and improvements...
     </p>
@@ -376,14 +383,14 @@
      <li>fix for content file deletion</li>
      <li>fix for directory iterator</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_31">0.9.3 -> 0.9.4</a></h2> <!-- index:2:SH:1:31:0.9.3 -> 0.9.4 -->
+   <h2><a class="a-header" name="SH_1_32">0.9.3 -> 0.9.4</a></h2> <!-- index:2:SH:1:32:0.9.3 -> 0.9.4 -->
     <ul>
      <li>Fixed memory leak when no <em>--log</em> switch.</li>
      <li>Windows build is more <em>gui</em> and less <em>command-line</em>.</li>
      <li><em>Info</em> command added to the administration interface.</li>
      <li>Doxygen files removed from binary RPM.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_32">0.9.2 -> 0.9.3</a></h2> <!-- index:2:SH:1:32:0.9.2 -> 0.9.3 -->
+   <h2><a class="a-header" name="SH_1_33">0.9.2 -> 0.9.3</a></h2> <!-- index:2:SH:1:33:0.9.2 -> 0.9.3 -->
     <ul>
      <li>Proxy mode (<em>--immediate</em> and <em>--as-proxy</em>).</li>
      <li>Message pre-processing (<em>--filter</em>).</li>
@@ -391,7 +398,7 @@
      <li>Improved notification script, with MIME encoding.</li>
      <li>Builds with old 2.91 version of gcc.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_33">0.9.1 -> 0.9.2</a></h2> <!-- index:2:SH:1:33:0.9.1 -> 0.9.2 -->
+   <h2><a class="a-header" name="SH_1_34">0.9.1 -> 0.9.2</a></h2> <!-- index:2:SH:1:34:0.9.1 -> 0.9.2 -->
     <ul>
      <li>Better autoconf detection.</li>
      <li>Workround for FreeBSD uname() feature.</li>
@@ -399,7 +406,7 @@
      <li>Fixed a benign directory iterator bug.</li>
      <li>Use of gcc's <em>exception</em> header.</li>
     </ul>
-   <h2><a class="a-header" name="SH_1_34">0.9 -> 0.9.1</a></h2> <!-- index:2:SH:1:34:0.9 -> 0.9.1 -->
+   <h2><a class="a-header" name="SH_1_35">0.9 -> 0.9.1</a></h2> <!-- index:2:SH:1:35:0.9 -> 0.9.1 -->
     <ul>
      <li>Improved documentation from doxygen.</li>
      <li>More complete use of namespaces.</li>
diff --git a/doc/changelog.md b/doc/changelog.md
index af5f00f..398e380 100644
--- a/doc/changelog.md
+++ b/doc/changelog.md
@@ -1,6 +1,14 @@
 E-MailRelay Change Log
 ======================
 
+2.2 -> 2.2.1
+------------
+
+* Unix domain sockets supported (eg. `--interface=/tmp/smtp.s`).
+* Windows event log not used for verbose logging (prefer `--log-file`).
+* New admin `forward` command to trigger forwarding without waiting.
+* Support for MbedTLS version 3.
+
 2.1 -> 2.2
 ----------
 
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 82cf4a0..241978f 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -2,6 +2,14 @@
 E-MailRelay Change Log
 **********************
 
+2.2 -> 2.2.1
+============
+
+* Unix domain sockets supported (eg. *--interface=/tmp/smtp.s*).
+* Windows event log not used for verbose logging (prefer *--log-file*).
+* New admin *forward* command to trigger forwarding without waiting.
+* Support for MbedTLS version 3.
+
 2.1 -> 2.2
 ==========
 
@@ -27,7 +35,7 @@ E-MailRelay Change Log
 * New *--idle-timeout* option for server-side connections.
 * Support for RFC-5782_ DNSBL_ blocking (\ *--dnsbl*\ ).
 * Filter scripts are given the path of the envelope file in argv2.
-* Message files can be editied by *--client-filter* scripts.
+* Message files can be edited by *--client-filter* scripts.
 * Better support for CRAM-SHAx authentication.
 * New *--client-auth-config* and *--server-auth-config* options.
 * New *--show* option on windows to better control the user interface style.
diff --git a/doc/changelog.txt b/doc/changelog.txt
index c6a0ad4..242e721 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,13 @@
 E-MailRelay Change Log
 ======================
 
+2.2 -> 2.2.1
+------------
+* Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+* Windows event log not used for verbose logging (prefer "--log-file").
+* New admin "forward" command to trigger forwarding without waiting.
+* Support for MbedTLS version 3.
+
 2.1 -> 2.2
 ----------
 * Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
@@ -24,7 +31,7 @@ E-MailRelay Change Log
 * New "--idle-timeout" option for server-side connections.
 * Support for RFC-5782 DNSBL blocking ("--dnsbl").
 * Filter scripts are given the path of the envelope file in argv2.
-* Message files can be editied by "--client-filter" scripts.
+* Message files can be edited by "--client-filter" scripts.
 * Better support for CRAM-SHAx authentication.
 * New "--client-auth-config" and "--server-auth-config" options.
 * New "--show" option on windows to better control the user interface style.
diff --git a/doc/emailrelay-man.html b/doc/emailrelay-man.html
index 09fed71..24dd93d 100644
--- a/doc/emailrelay-man.html
+++ b/doc/emailrelay-man.html
@@ -366,8 +366,7 @@ Graeme Walker, mailto:<A HREF="mailto:graeme_walker@users.sourceforge.net">graem
 </DL>
 <HR>
 This document was created by
-<A HREF="lynxcgi:FOO/cgi-bin/man/man2html">man2html</A>,
+<A HREF="lynxcgi:./cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
 </BODY>
 </HTML>
-<!-- Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
diff --git a/doc/reference.html b/doc/reference.html
index 8403f3e..2c6df19 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -15,7 +15,7 @@
     </p>
 
       <div class="div-pre">
-       <pre>emailrelay [<option> [<option> ...]] [<config-file>]
+       <pre>emailrelay [&lt;option&gt; [&lt;option&gt; ...]] [&lt;config-file&gt;]
 </pre>
       </div><!-- div-pre -->
     <p>
@@ -595,9 +595,9 @@ envelope="${2}"
 ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`"
 if test "${ip}" = "192.168.0.2"
 then
-    /usr/sbin/sendmail -t < "${content}"
+    /usr/sbin/sendmail -t &lt; "${content}"
     rm -f "${envelope}" "${content}"
-    exit 100 # <= cancel further processing by emailrelay
+    exit 100 # &lt;= cancel further processing by emailrelay
 fi
 exit 0
 </pre>
@@ -1083,6 +1083,49 @@ password required pam_deny.so
        <pre>--as-client ipv4or6.example.com:25 --client-interface 0.0.0.0
 --as-client ipv4or6.example.com:25 --client-interface ::</pre>
       </div><!-- div-pre -->
+   <h2><a class="a-header" name="SH_1_99">Unix domain sockets</a></h2> <!-- index:2:SH:1:99:Unix domain sockets -->
+    <p>
+     E-MailRelay on Unix will listen on unix-domain sockets instead of IPv4 or IPv6
+     if the <em>--interface</em> option is given as an absolute file-system path:
+    </p>
+
+    <p>
+     Eg:
+    </p>
+      <div class="div-pre">
+       <pre>--interface=/run/smtp.s --port=0</pre>
+      </div><!-- div-pre -->
+    <p>
+     When listening on more than one unix-domain socket use the extended form of the
+     "--interface" option with a prefix of "smtp=", "pop=", or "admin=":
+    </p>
+    <p>
+     Eg:
+    </p>
+      <div class="div-pre">
+       <pre>--interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0</pre>
+      </div><!-- div-pre -->
+    <p>
+     The forwarding address can also be a unix-domain address:
+    </p>
+    <p>
+     Eg:
+    </p>
+      <div class="div-pre">
+       <pre>--forward-to=/run/smtp.s</pre>
+      </div><!-- div-pre -->
+    <p>
+     And it is also possible to communicate with message filters over a unix-domain
+     socket:
+    </p>
+    <p>
+     Eg:
+    </p>
+      <div class="div-pre">
+       <pre>--filter=net:/run/filter.s
+--filter=spam:/run/spamd.s
+--filter=spam-edit:/run/spamd.s</pre>
+      </div><!-- div-pre -->
    <h2><a class="a-header" name="SH_1_9">SOCKS</a></h2> <!-- index:2:SH:1:9:SOCKS -->
     <p>
      E-MailRelay can use a SOCKS 4a proxy for establishing outgoing SMTP
@@ -1167,7 +1210,7 @@ exit 1
       <div class="div-pre">
        <pre>#!/bin/sh
 # address verifier -- accept as local (250)
-echo Local Postmaster '<postmaster@localhost>'
+echo Local Postmaster '&lt;postmaster@localhost&gt;'
 echo postmaster
 exit 0
 </pre>
@@ -1229,7 +1272,7 @@ exit 100
        <pre>#!/bin/sh
 # address verifier -- accept only if containing an at sign
 address="$1"
-expr "$address" : ".*@" > /dev/null || exit 2
+expr "$address" : ".*@" &gt; /dev/null || exit 2
 echo ""
 echo "$address"
 exit 1 # accept
@@ -1444,13 +1487,14 @@ catch( e )
       <div class="div-pre">
        <pre>$ emailrelay --as-server --port=125 --forward-to=localhost:25 --admin=10026
 $ telnet localhost 10026
-E-MailRelay> help
-E-MailRelay> quit
+E-MailRelay&gt; help
+E-MailRelay&gt; quit
 </pre>
       </div><!-- div-pre -->
     <p>
      The <em>flush</em> command is used to get the E-MailRelay server to forward spooled
-     mail to the next SMTP server.
+     mail to the next SMTP server. The <em>forward</em> command does the same but without
+     waiting for completion.
     </p>
 
     <p>
@@ -1497,6 +1541,7 @@ E-MailRelay> quit
      <li>e_docdir=&lt;dir&gt;</li>
      <li>e_examplesdir=&lt;dir&gt;</li>
      <li>e_icondir=&lt;dir&gt;</li>
+     <li>e_trdir=&lt;dir&gt;</li>
      <li>e_initdir=&lt;dir&gt;</li>
      <li>e_libexecdir=&lt;dir&gt;</li>
      <li>e_pamdir=&lt;dir&gt;</li>
diff --git a/doc/reference.md b/doc/reference.md
index 25d3977..1da955c 100644
--- a/doc/reference.md
+++ b/doc/reference.md
@@ -210,7 +210,7 @@ where &lt;option&gt; is:
 *   \-\-hidden (-H)
 
     Windows only. Hides the application window and disables all message boxes,
-    overriding any ``--show`` option. This is useful when running  as a windows
+    overriding any `--show` option. This is useful when running  as a windows
     service.
 
 *   \-\-idle-timeout &lt;time&gt;
@@ -895,6 +895,37 @@ Eg:
         --as-client ipv4or6.example.com:25 --client-interface 0.0.0.0
         --as-client ipv4or6.example.com:25 --client-interface ::
 
+Unix domain sockets
+-------------------
+E-MailRelay on Unix will listen on unix-domain sockets instead of IPv4 or IPv6
+if the `--interface` option is given as an absolute file-system path:
+
+Eg:
+
+        --interface=/run/smtp.s --port=0
+
+When listening on more than one unix-domain socket use the extended form of the
+`--interface` option with a prefix of `smtp=`, `pop=`, or `admin=`:
+
+Eg:
+
+        --interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0
+
+The forwarding address can also be a unix-domain address:
+
+Eg:
+
+        --forward-to=/run/smtp.s
+
+And it is also possible to communicate with message filters over a unix-domain
+socket:
+
+Eg:
+
+        --filter=net:/run/filter.s
+        --filter=spam:/run/spamd.s
+        --filter=spam-edit:/run/spamd.s
+
 SOCKS
 -----
 E-MailRelay can use a [SOCKS][] 4a proxy for establishing outgoing SMTP
@@ -1184,7 +1215,8 @@ simple command-line interface which is compatible with `netcat` and `telnet`:
         E-MailRelay> quit
 
 The `flush` command is used to get the E-MailRelay server to forward spooled
-mail to the next SMTP server.
+mail to the next SMTP server. The `forward` command does the same but without
+waiting for completion.
 
 The `list` command lists the messages in the spool directory, `status` provides
 network status information and activity statistics, and `notify` enables
@@ -1222,6 +1254,7 @@ Installation directories can be defined at build-time by the following
 * e_docdir=&lt;dir&gt;
 * e_examplesdir=&lt;dir&gt;
 * e_icondir=&lt;dir&gt;
+* e_trdir=&lt;dir&gt;
 * e_initdir=&lt;dir&gt;
 * e_libexecdir=&lt;dir&gt;
 * e_pamdir=&lt;dir&gt;
diff --git a/doc/reference.rst b/doc/reference.rst
index c048e83..deb0950 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -213,7 +213,7 @@ where \<option\> is:
 *   --hidden (-H)
 
     Windows only. Hides the application window and disables all message boxes,
-    overriding any **--show** option. This is useful when running  as a windows
+    overriding any *--show* option. This is useful when running  as a windows
     service.
 
 *   --idle-timeout \<time\>
@@ -938,6 +938,45 @@ Eg:
     --as-client ipv4or6.example.com:25 --client-interface 0.0.0.0
     --as-client ipv4or6.example.com:25 --client-interface ::
 
+Unix domain sockets
+===================
+E-MailRelay on Unix will listen on unix-domain sockets instead of IPv4 or IPv6
+if the *--interface* option is given as an absolute file-system path:
+
+Eg:
+
+::
+
+    --interface=/run/smtp.s --port=0
+
+When listening on more than one unix-domain socket use the extended form of the
+*--interface* option with a prefix of *smtp=*, *pop=*, or *admin=*:
+
+Eg:
+
+::
+
+    --interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0
+
+The forwarding address can also be a unix-domain address:
+
+Eg:
+
+::
+
+    --forward-to=/run/smtp.s
+
+And it is also possible to communicate with message filters over a unix-domain
+socket:
+
+Eg:
+
+::
+
+    --filter=net:/run/filter.s
+    --filter=spam:/run/spamd.s
+    --filter=spam-edit:/run/spamd.s
+
 SOCKS
 =====
 E-MailRelay can use a SOCKS_ 4a proxy for establishing outgoing SMTP
@@ -1251,7 +1290,8 @@ simple command-line interface which is compatible with *netcat* and *telnet*:
     E-MailRelay> quit
 
 The *flush* command is used to get the E-MailRelay server to forward spooled
-mail to the next SMTP server.
+mail to the next SMTP server. The *forward* command does the same but without
+waiting for completion.
 
 The *list* command lists the messages in the spool directory, *status* provides
 network status information and activity statistics, and *notify* enables
@@ -1289,6 +1329,7 @@ Installation directories can be defined at build-time by the following
 * e_docdir=\<dir\>
 * e_examplesdir=\<dir\>
 * e_icondir=\<dir\>
+* e_trdir=\<dir\>
 * e_initdir=\<dir\>
 * e_libexecdir=\<dir\>
 * e_pamdir=\<dir\>
diff --git a/doc/reference.txt b/doc/reference.txt
index 49715ca..1d6f335 100644
--- a/doc/reference.txt
+++ b/doc/reference.txt
@@ -178,7 +178,7 @@ where <option> is:
 
 # --hidden (-H)
   Windows only. Hides the application window and disables all message boxes,
-  overriding any ""--show"" option. This is useful when running  as a windows
+  overriding any "--show" option. This is useful when running  as a windows
   service.
 
 # --idle-timeout <time>
@@ -820,6 +820,33 @@ Eg:
 	--as-client ipv4or6.example.com:25 --client-interface 0.0.0.0
 	--as-client ipv4or6.example.com:25 --client-interface ::
 
+Unix domain sockets
+-------------------
+E-MailRelay on Unix will listen on unix-domain sockets instead of IPv4 or IPv6
+if the "--interface" option is given as an absolute file-system path:
+
+Eg:
+	--interface=/run/smtp.s --port=0
+
+When listening on more than one unix-domain socket use the extended form of the
+"--interface" option with a prefix of "smtp=", "pop=", or "admin=":
+
+Eg:
+	--interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0
+
+The forwarding address can also be a unix-domain address:
+
+Eg:
+	--forward-to=/run/smtp.s
+
+And it is also possible to communicate with message filters over a unix-domain
+socket:
+
+Eg:
+	--filter=net:/run/filter.s
+	--filter=spam:/run/spamd.s
+	--filter=spam-edit:/run/spamd.s
+
 SOCKS
 -----
 E-MailRelay can use a SOCKS 4a proxy for establishing outgoing SMTP
@@ -1109,7 +1136,8 @@ simple command-line interface which is compatible with "netcat" and "telnet":
 	E-MailRelay> quit
 
 The "flush" command is used to get the E-MailRelay server to forward spooled
-mail to the next SMTP server.
+mail to the next SMTP server. The "forward" command does the same but without
+waiting for completion.
 
 The "list" command lists the messages in the spool directory, "status" provides
 network status information and activity statistics, and "notify" enables
@@ -1146,6 +1174,7 @@ Installation directories can be defined at build-time by the following
 * e_docdir=<dir>
 * e_examplesdir=<dir>
 * e_icondir=<dir>
+* e_trdir=<dir>
 * e_initdir=<dir>
 * e_libexecdir=<dir>
 * e_pamdir=<dir>
diff --git a/doc/userguide.html b/doc/userguide.html
index 3e7f52a..0d75fe1 100644
--- a/doc/userguide.html
+++ b/doc/userguide.html
@@ -431,7 +431,7 @@ WScript.Quit( 0 ) ;
 
       <div class="div-pre">
        <pre>#!/bin/sh
-spamassassin "$1" > "$1.tmp"
+spamassassin "$1" &gt; "$1.tmp"
 mv "$1.tmp" "$1"
 exit 0
 </pre>
@@ -441,7 +441,7 @@ exit 0
     </p>
 
       <div class="div-pre">
-       <pre>c:\perl\site\bin\spamassassin.bat %1 > %1.tmp
+       <pre>c:\perl\site\bin\spamassassin.bat %1 &gt; %1.tmp
 ren %1.tmp %1
 exit 0</pre>
       </div><!-- div-pre -->
diff --git a/doc/windows.txt b/doc/windows.txt
index b503079..aef49fb 100644
--- a/doc/windows.txt
+++ b/doc/windows.txt
@@ -9,6 +9,9 @@ setup program "emailrelay-setup.exe" and its associated "payload" files.
 Run "emailrelay-setup.exe" as an administrator if you are going to be installing
 into protected directories like "Program Files".
 
+You may need to run "vc_redist.x64.exe" first to install the Microsoft C++
+run-time files.
+
 The setup GUI will take you through the installation options and then install
 the run-time files into your chosen locations.
 
@@ -24,9 +27,10 @@ run the "emailrelay-start.bat" batch file to start the E-MailRelay server, and
 you should then see an icon appear in the Windows system tray under the "Show
 hidden icons" button.
 
-Note that the "emailrelay-start.bat" file lives under "ProgramData", and although
-this might be a hidden directory you can still navigate there by right-clicking
-on the E-MailRelay link under "Program Files" and selecting "Open file location".
+Note that the "emailrelay-start.bat" file lives under "ProgramData", and
+although this might be a hidden directory you can still navigate there by
+right-clicking on the "E-MailRelay" link under "Program Files" and selecting
+"Open file location".
 
 Configuration
 -------------
diff --git a/emailrelay.spec b/emailrelay.spec
index 3c3592b..17f33d8 100644
--- a/emailrelay.spec
+++ b/emailrelay.spec
@@ -1,11 +1,11 @@
 Summary: Simple e-mail message transfer agent and proxy using SMTP
 Name: emailrelay
-Version: 2.2
+Version: 2.2.1
 Release: 1
 License: GPL3
 Group: System Environment/Daemons
 URL: http://emailrelay.sourceforge.net
-Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.2/emailrelay-2.2-src.tar.gz
+Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.2/emailrelay-2.2.1-src.tar.gz
 BuildRoot: /tmp/emailrelay-install
 
 %description
@@ -53,14 +53,11 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
 
 %files
 
-/etc/emailrelay.auth.template
 /etc/emailrelay.auth.template
 %config /etc/emailrelay.conf
 /etc/emailrelay.conf.template
-/etc/emailrelay.conf.template
 /etc/init.d/emailrelay
 %config /etc/pam.d/emailrelay
-%config /etc/pam.d/emailrelay
 %dir /usr/lib/emailrelay
 %attr(2755, root, daemon) /usr/lib/emailrelay/emailrelay-filter-copy
 %dir /usr/lib/emailrelay/examples
@@ -68,8 +65,6 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
 /usr/lib/emailrelay/examples/emailrelay-bcc-check.pl
 /usr/lib/emailrelay/examples/emailrelay-deliver.sh
 /usr/lib/emailrelay/examples/emailrelay-fail2ban-filter
-/usr/lib/emailrelay/examples/emailrelay-fail2ban-filter
-/usr/lib/emailrelay/examples/emailrelay-fail2ban-jail
 /usr/lib/emailrelay/examples/emailrelay-fail2ban-jail
 /usr/lib/emailrelay/examples/emailrelay-ldap-verify.py
 /usr/lib/emailrelay/examples/emailrelay-multicast.sh
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 27b52fe..80803ba 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -217,6 +217,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -253,6 +254,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -325,8 +327,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -428,7 +430,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/etc/emailrelay.service.in b/etc/emailrelay.service.in
index e1ab934..fd08099 100644
--- a/etc/emailrelay.service.in
+++ b/etc/emailrelay.service.in
@@ -12,3 +12,7 @@ ExecStart=__INIT_DIR__/emailrelay start
 ExecStop=__INIT_DIR__/emailrelay stop
 PIDFile=__RUN_DIR__/emailrelay.pid
 SuccessExitStatus=0 143
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/m4/Makefile.in b/m4/Makefile.in
index b9ed3fc..c957949 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -185,6 +185,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -221,6 +222,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -273,8 +275,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -292,7 +294,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 816f92c..464dce2 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -18,23 +18,9 @@ dnl ----------------------
 dnl Checks c++ language features.
 dnl
 AC_DEFUN([GCONFIG_FN_CHECK_CXX],[
-	AC_REQUIRE([GCONFIG_FN_CXX_NULLPTR])
-	AC_REQUIRE([GCONFIG_FN_CXX_CONSTEXPR])
-	AC_REQUIRE([GCONFIG_FN_CXX_ENUM_CLASS])
-	AC_REQUIRE([GCONFIG_FN_CXX_NOEXCEPT])
-	AC_REQUIRE([GCONFIG_FN_CXX_OVERRIDE])
-	AC_REQUIRE([GCONFIG_FN_CXX_FINAL])
-	AC_REQUIRE([GCONFIG_FN_CXX_TYPE_TRAITS])
-	AC_REQUIRE([GCONFIG_FN_CXX_EMPLACE])
 	AC_REQUIRE([GCONFIG_FN_CXX_ALIGNMENT])
-	AC_REQUIRE([GCONFIG_FN_CXX_MOVE])
-	AC_REQUIRE([GCONFIG_FN_CXX_SHARED_PTR])
 	AC_REQUIRE([GCONFIG_FN_CXX_MAKE_UNIQUE])
 	AC_REQUIRE([GCONFIG_FN_CXX_STD_THREAD])
-	AC_REQUIRE([GCONFIG_FN_CXX_STD_WSTRING])
-	AC_REQUIRE([GCONFIG_FN_CXX_DELETED])
-	AC_REQUIRE([GCONFIG_FN_CXX_DEFAULTED])
-	AC_REQUIRE([GCONFIG_FN_CXX_INITIALIZER_LIST])
 ])
 
 dnl GCONFIG_FN_CHECK_FUNCTIONS
@@ -46,6 +32,7 @@ AC_DEFUN([GCONFIG_FN_CHECK_FUNCTIONS],[
 	AC_REQUIRE([GCONFIG_FN_GETPWNAM_R])
 	AC_REQUIRE([GCONFIG_FN_GETGRNAM])
 	AC_REQUIRE([GCONFIG_FN_GETGRNAM_R])
+	AC_REQUIRE([GCONFIG_FN_GETTEXT])
 	AC_REQUIRE([GCONFIG_FN_GMTIME_R])
 	AC_REQUIRE([GCONFIG_FN_GMTIME_S])
 	AC_REQUIRE([GCONFIG_FN_LOCALTIME_R])
@@ -148,6 +135,7 @@ AC_DEFUN([GCONFIG_FN_CHECK_NET],[
 	AC_REQUIRE([GCONFIG_FN_IFNAMETOINDEX])
 	AC_REQUIRE([GCONFIG_FN_IFNAMETOLUID])
 	AC_REQUIRE([GCONFIG_FN_GAISTRERROR])
+	AC_REQUIRE([GCONFIG_FN_UDS])
 ])
 
 dnl GCONFIG_FN_CHECK_TYPES
@@ -173,6 +161,7 @@ AC_DEFUN([GCONFIG_FN_CHECK_TYPES],[
 		AC_DEFINE([GCONFIG_HAVE_GID_T],0,[Define true if gid_t is a type]))
 	AC_REQUIRE([GCONFIG_FN_STATBUF_TIMESPEC])
 	AC_REQUIRE([GCONFIG_FN_STATBUF_NSEC])
+	AC_REQUIRE([GCONFIG_FN_IOVEC_SIMPLE])
 ])
 
 dnl GCONFIG_FN_CXX_ALIGNMENT
@@ -205,308 +194,8 @@ AC_DEFUN([GCONFIG_FN_CXX_ALIGNMENT],
 	fi
 ])
 
-dnl GCONFIG_FN_CXX_CONSTEXPR
-dnl ------------------------
-dnl Tests for c++ support for constexpr in a static initialisation.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_CONSTEXPR],
-[AC_CACHE_CHECK([for c++ constexpr],[gconfig_cv_cxx_constexpr],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[template <typename T> struct Foo {static constexpr int foo = 1;} ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_constexpr=yes ,
-		gconfig_cv_cxx_constexpr=no )
-])
-	if test "$gconfig_cv_cxx_constexpr" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_CONSTEXPR,1,[Define true if compiler supports c++ constexpr])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_CONSTEXPR,0,[Define true if compiler supports c++ constexpr])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_DEFAULTED
-dnl ----------------------
-dnl Tests for c++ =default.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_DEFAULTED],
-[AC_CACHE_CHECK([for c++ eq default],[gconfig_cv_cxx_defaulted],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#if defined(__GNUC__) && __cplusplus < 200000L]
-			[#error gcc is too noisy when using =delete without std=c++11]
-			[#endif]
-			[struct X { X() = default ; } ;]
-		] ,
-		[
-		])],
-		gconfig_cv_cxx_defaulted=yes ,
-		gconfig_cv_cxx_defaulted=no )
-])
-	if test "$gconfig_cv_cxx_defaulted" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_DEFAULTED,1,[Define true if compiler supports c++ =default])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_DEFAULTED,0,[Define true if compiler supports c++ =default])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_DELETED
-dnl ----------------------
-dnl Tests for c++ =delete.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_DELETED],
-[AC_CACHE_CHECK([for c++ eq delete],[gconfig_cv_cxx_deleted],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#if defined(__GNUC__) && __cplusplus < 200000L]
-			[#error gcc is too noisy when using =delete without std=c++11]
-			[#endif]
-			[struct X { X(const X&) = delete ; } ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_deleted=yes ,
-		gconfig_cv_cxx_deleted=no )
-])
-	if test "$gconfig_cv_cxx_deleted" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_DELETED,1,[Define true if compiler supports c++ =delete])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_DELETED,0,[Define true if compiler supports c++ =delete])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_EMPLACE
-dnl ----------------------
-dnl Tests for c++ std::vector::emplace_back() etc.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_EMPLACE],
-[AC_CACHE_CHECK([for c++ emplace_back and friends],[gconfig_cv_cxx_emplace],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <vector>]
-			[std::vector<int> v ;]
-		],
-		[
-			[v.emplace_back(1) ;]
-		])],
-		gconfig_cv_cxx_emplace=yes ,
-		gconfig_cv_cxx_emplace=no )
-])
-	if test "$gconfig_cv_cxx_emplace" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_EMPLACE,1,[Define true if compiler has std::vector::emplace_back()])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_EMPLACE,0,[Define true if compiler has std::vector::emplace_back()])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_ENUM_CLASS
-dnl -------------------------
-dnl Tests for c++ support for class enums.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_ENUM_CLASS],
-[AC_CACHE_CHECK([for c++ class enums],[gconfig_cv_cxx_enum_class],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[enum class Type { t1 , t2 } ;]
-			[Type t = Type::t1 ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_enum_class=yes ,
-		gconfig_cv_cxx_enum_class=no )
-])
-	if test "$gconfig_cv_cxx_enum_class" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_ENUM_CLASS,1,[Define true if compiler supports c++ class enums])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_ENUM_CLASS,0,[Define true if compiler supports c++ class enums])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_FINAL
-dnl --------------------
-dnl Tests for c++ final keyword.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_FINAL],
-[AC_CACHE_CHECK([for c++ final keyword],[gconfig_cv_cxx_final],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#if defined(__GNUC__) && __cplusplus < 200000L]
-			[#error gcc is too noisy when using override/final without std=c++11]
-			[#endif]
-			[struct base { virtual void fn() {} } ;]
-			[struct derived : public base { virtual void fn() final {} } ;]
-			[derived d ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_final=yes ,
-		gconfig_cv_cxx_final=no )
-])
-	if test "$gconfig_cv_cxx_final" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_FINAL,1,[Define true if compiler supports c++ final keyword])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_FINAL,0,[Define true if compiler supports c++ final keyword])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_INITIALIZER_LIST
-dnl -------------------------------
-dnl Tests for c++ initializer_list.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_INITIALIZER_LIST],
-[AC_CACHE_CHECK([for c++ initializer_list],[gconfig_cv_cxx_initializer_list],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <initializer_list>]
-			[struct X { X( std::initializer_list<int> ) {} } ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_initializer_list=yes ,
-		gconfig_cv_cxx_initializer_list=no )
-])
-	if test "$gconfig_cv_cxx_initializer_list" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_INITIALIZER_LIST,1,[Define true if compiler supports c++ initializer_list])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_INITIALIZER_LIST,0,[Define true if compiler supports c++ initializer_list])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_MOVE
-dnl -------------------
-dnl Tests for c++ std::move.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_MOVE],
-[AC_CACHE_CHECK([for c++ std::move],[gconfig_cv_cxx_move],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <utility>]
-			[struct X {} x ;]
-			[void fn( X&& ) ;]
-		],
-		[
-			[fn( std::move(x) ) ;]
-		])],
-		gconfig_cv_cxx_move=yes ,
-		gconfig_cv_cxx_move=no )
-])
-	if test "$gconfig_cv_cxx_move" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_MOVE,1,[Define true if compiler has std::move()])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_MOVE,0,[Define true if compiler has std::move()])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_NOEXCEPT
-dnl -----------------------
-dnl Tests for c++ noexcept support.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_NOEXCEPT],
-[AC_CACHE_CHECK([for c++ noexcept],[gconfig_cv_cxx_noexcept],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[void fn() noexcept ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_noexcept=yes ,
-		gconfig_cv_cxx_noexcept=no )
-])
-	if test "$gconfig_cv_cxx_noexcept" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_NOEXCEPT,1,[Define true if compiler supports c++ noexcept])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_NOEXCEPT,0,[Define true if compiler supports c++ noexcept])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_NULLPTR
-dnl ----------------------
-dnl Tests for c++ nullptr keyword.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_NULLPTR],
-[AC_CACHE_CHECK([for c++ nullptr],[gconfig_cv_cxx_nullptr],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[void * p = nullptr ;]
-		] ,
-		[
-		])],
-		gconfig_cv_cxx_nullptr=yes ,
-		gconfig_cv_cxx_nullptr=no )
-])
-	if test "$gconfig_cv_cxx_nullptr" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_NULLPTR,1,[Define true if compiler supports c++ nullptr])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_NULLPTR,0,[Define true if compiler supports c++ nullptr])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_OVERRIDE
-dnl -----------------------
-dnl Tests for c++ override support.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_OVERRIDE],
-[AC_CACHE_CHECK([for c++ override],[gconfig_cv_cxx_override],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#if defined(__GNUC__) && __cplusplus < 200000L]
-			[#error gcc is too noisy when using override/final without std=c++11]
-			[#endif]
-			[struct base { virtual void fn() {} } ;]
-			[struct derived : public base { virtual void fn() override {} } ;]
-			[derived d ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_override=yes ,
-		gconfig_cv_cxx_override=no )
-])
-	if test "$gconfig_cv_cxx_override" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_OVERRIDE,1,[Define true if compiler supports c++ override])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_OVERRIDE,0,[Define true if compiler supports c++ override])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_SHARED_PTR
-dnl -------------------------
-dnl Tests for c++ std::shared_ptr.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_SHARED_PTR],
-[AC_CACHE_CHECK([for c++ std::shared_ptr and friends],[gconfig_cv_cxx_std_shared_ptr],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <memory>]
-			[typedef std::shared_ptr<int> ptr ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_std_shared_ptr=yes ,
-		gconfig_cv_cxx_std_shared_ptr=no )
-])
-	if test "$gconfig_cv_cxx_std_shared_ptr" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_SHARED_PTR,1,[Define true if compiler has std::shared_ptr])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_SHARED_PTR,0,[Define true if compiler has std::shared_ptr])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_SHARED_PTR
-dnl -------------------------
+dnl GCONFIG_FN_CXX_MAKE_UNIQUE
+dnl --------------------------
 dnl Tests for c++ std::make_unique.
 dnl
 AC_DEFUN([GCONFIG_FN_CXX_MAKE_UNIQUE],
@@ -625,54 +314,6 @@ AC_DEFUN([GCONFIG_FN_CXX_STD_THREAD],
 	GCONFIG_FN_CXX_STD_THREAD_IMP([std::thread_asynchronous_script_execution])
 ])
 
-dnl GCONFIG_FN_CXX_STD_WSTRING
-dnl --------------------------
-dnl Tests for std::wstring typedef.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_STD_WSTRING],
-[AC_CACHE_CHECK([for c++ std::wstring],[gconfig_cv_cxx_std_wstring],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <string>]
-			[std::wstring ws;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_std_wstring=yes ,
-		gconfig_cv_cxx_std_wstring=no )
-])
-	if test "$gconfig_cv_cxx_std_wstring" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_STD_WSTRING,1,[Define true if compiler has std::wstring])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_STD_WSTRING,0,[Define true if compiler has std::wstring])
-	fi
-])
-
-dnl GCONFIG_FN_CXX_TYPE_TRAITS
-dnl --------------------------
-dnl Tests for c++ <type_traits> std::make_unsigned.
-dnl
-AC_DEFUN([GCONFIG_FN_CXX_TYPE_TRAITS],
-[AC_CACHE_CHECK([for c++ type_traits],[gconfig_cv_cxx_type_traits_make_unsigned],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[
-			[#include <type_traits>]
-			[std::make_unsigned<int>::type i = 0U ;]
-		],
-		[
-		])],
-		gconfig_cv_cxx_type_traits_make_unsigned=yes ,
-		gconfig_cv_cxx_type_traits_make_unsigned=no )
-])
-	if test "$gconfig_cv_cxx_type_traits_make_unsigned" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED,1,[Define true if compiler has <type_traits> make_unsigned])
-	else
-		AC_DEFINE(GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED,0,[Define true if compiler has <type_traits> make_unsigned])
-	fi
-])
-
 dnl GCONFIG_FN_ENABLE_BSD
 dnl ---------------------
 dnl Enables bsd tweaks if "--enable-bsd" is used. Typically used after
@@ -734,39 +375,46 @@ AC_DEFUN([GCONFIG_FN_ENABLE_EPOLL],
 dnl GCONFIG_FN_ENABLE_GUI
 dnl ---------------------
 dnl Allows for "if GCONFIG_GUI" conditionals in makefiles, based on "--enable-gui"
-dnl or QT_MOC. Typically used after GCONFIG_FN_QT and AC_ARG_ENABLE(gui).
+dnl or "gconfig_have_qt" and "gconfig_qt_build" if "auto". Typically used after
+dnl GCONFIG_FN_QT, GCONFIG_FN_QT_BUILD and AC_ARG_ENABLE(gui).
 dnl
 AC_DEFUN([GCONFIG_FN_ENABLE_GUI],
 [
 	if test "$enable_gui" = "no"
 	then
-		QT_MOC=""
-	fi
-
-	if test "$enable_gui" = "yes"
+		gconfig_gui="no"
+	:
+	elif test "$enable_gui" = "yes"
 	then
+		gconfig_gui="yes"
 		if test "$gconfig_have_qt" = "no"
 		then
-			AC_MSG_WARN([ignoring --enable-gui: set QT_MOC to override])
-			QT_MOC=""
+			AC_MSG_WARN([gui enabled but no qt tools found])
+		fi
+		if test "$gconfig_qt_build" = "no"
+		then
+			AC_MSG_WARN([gui enabled but qt does not compile])
+		fi
+	:
+	else
+		if test "$gconfig_have_qt" = "yes" -a "$gconfig_qt_build" = "yes"
+		then
+			gconfig_gui="yes"
+		else
+			gconfig_gui="no"
 		fi
 	fi
 
-	if test "$enable_gui" != "no" -a "$QT_MOC" = ""
+	if test "$gconfig_gui" = "no" -a "$enable_gui" != "no"
 	then
 		gconfig_warnings="$gconfig_warnings qt_graphical_user_interface"
 	fi
 
-	if test "$QT_MOC" != ""
-	then
-		AC_MSG_NOTICE([QT moc command: $QT_MOC])
-	fi
-
 	AC_SUBST([GCONFIG_QT_LIBS],[$QT_LIBS])
 	AC_SUBST([GCONFIG_QT_CFLAGS],[$QT_CFLAGS])
 	AC_SUBST([GCONFIG_QT_MOC],[$QT_MOC])
 
-	AM_CONDITIONAL([GCONFIG_GUI],[test "$QT_MOC" != ""])
+	AM_CONDITIONAL([GCONFIG_GUI],[test "$gconfig_gui" = "yes"])
 ])
 
 dnl GCONFIG_FN_ENABLE_INSTALL_HOOK
@@ -842,7 +490,7 @@ dnl GCONFIG_FN_ENABLE_STD_THREAD
 dnl ----------------------------
 dnl Defines GCONFIG_ENABLE_STD_THREAD based on the GCONFIG_FN_CXX_STD_THREAD
 dnl result, unless "--disable-std-thread" has disabled it. Using
-dnl "--disable-std-thread" is useful for current versions of mingw32-w64.
+dnl "--disable-std-thread" is useful for old versions of mingw32-w64.
 dnl
 dnl Typically used after GCONFIG_FN_CXX_STD_THREAD and AC_ARG_ENABLE(std-thread).
 dnl
@@ -1195,6 +843,36 @@ AC_DEFUN([GCONFIG_FN_GETGRNAM_R],
 	fi
 ])
 
+dnl GCONFIG_FN_GETTEXT
+dnl --------------------
+dnl Tests for gettext and sets gconfig_cv_gettext. Used before
+dnl AC_ARG_WITH and GCONFIG_FN_WITH_GETTEXT.
+dnl
+dnl Typically needs CFLAGS, LIBS and LDFLAGS etc. to be set
+dnl correctly.
+dnl
+dnl See also GCONFIG_FN_GETTEXT_NEW and AM_GNU_GETTEXT.
+dnl
+AC_DEFUN([GCONFIG_FN_GETTEXT],
+[AC_CACHE_CHECK([for gettext],[gconfig_cv_gettext],
+[
+	AC_LINK_IFELSE([AC_LANG_PROGRAM(
+		[
+			[#include <libintl.h>]
+			[const char * p = 0;]
+			[const char * dir = 0;]
+			[const char * md = 0;]
+		],
+		[
+			[p = gettext( "foo" );]
+			[dir = bindtextdomain( "foo" , "bar" );]
+			[md = textdomain( "foo" );]
+		])],
+		gconfig_cv_gettext=yes ,
+		gconfig_cv_gettext=no )
+])
+])
+
 dnl GCONFIG_FN_GMTIME_R
 dnl -------------------
 dnl Tests for gmtime_r().
@@ -1459,6 +1137,39 @@ AC_DEFUN([GCONFIG_FN_INET_PTON],
 	fi
 ])
 
+dnl GCONFIG_FN_IOVEC_SIMPLE
+dnl -----------------------
+dnl Tests whether struct iovec is available and matches
+dnl the layout of a trivial {char*,size_t} structure.
+dnl
+AC_DEFUN([GCONFIG_FN_IOVEC_SIMPLE],
+[AC_CACHE_CHECK([for iovec layout],[gconfig_cv_iovec_is_simple],
+[
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+		[
+			[#include <cstddef>]
+			[#include <sys/types.h>]
+			[#include <sys/uio.h>]
+			[struct simple { const char * p ; std::size_t n ; } ;]
+		],
+		[
+            static_assert( sizeof(simple) == sizeof(::iovec) , "" ) ;
+            static_assert( alignof(simple) == alignof(::iovec) , "" ) ;
+            static_assert( sizeof(simple::p) == sizeof(::iovec::iov_base) , "" ) ;
+            static_assert( sizeof(simple::n) == sizeof(::iovec::iov_len) , "" ) ;
+            static_assert( offsetof(simple,p) == offsetof(::iovec,iov_base) , "" ) ;
+            static_assert( offsetof(simple,n) == offsetof(::iovec,iov_len) , "" ) ;
+		])],
+		gconfig_cv_iovec_is_simple=yes ,
+		gconfig_cv_iovec_is_simple=no )
+])
+	if test "$gconfig_cv_iovec_is_simple" = "yes" ; then
+		AC_DEFINE(GCONFIG_HAVE_IOVEC_SIMPLE,1,[Define true if struct iovec has a simple layout])
+	else
+		AC_DEFINE(GCONFIG_HAVE_IOVEC_SIMPLE,0,[Define true if struct iovec has a simple layout])
+	fi
+])
+
 dnl GCONFIG_FN_IPV6
 dnl ---------------
 dnl Tests for a minimum set of IPv6 features available.
@@ -1573,7 +1284,7 @@ AC_DEFUN([GCONFIG_FN_NETROUTE],
 			[struct ifa_msghdr header2 ;]
 		] ,
 		[
-			[int fd = socket( PF_ROUTE , SOCK_RAW , AF_INET ) ;]
+			[(void) socket( PF_ROUTE , SOCK_RAW , AF_INET ) ;]
 			[header1.rtm_msglen = header2.ifam_msglen = 0 ;]
 			[header1.rtm_type = RTM_ADD ;]
 			[header2.ifam_type = RTM_NEWADDR ;]
@@ -1801,13 +1512,14 @@ AC_DEFUN([GCONFIG_FN_PTHREAD_SIGMASK],
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 		[
 			[#include <csignal>]
+			[#include <cstddef>]
 			[sigset_t set ;]
 			[int rc ;]
 		],
 		[
 			[sigemptyset( &set ) ;]
 			[sigaddset( &set , SIGTERM ) ;]
-			[rc = pthread_sigmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , &set ) ;]
+			[rc = pthread_sigmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , NULL ) ;]
 		])],
 		gconfig_cv_pthread_sigmask=yes ,
 		gconfig_cv_pthread_sigmask=no )
@@ -1850,12 +1562,13 @@ AC_DEFUN([GCONFIG_FN_PUTENV_S],
 
 dnl GCONFIG_FN_QT
 dnl -------------
-dnl Tests for Qt5. Sets gconfig_have_qt, QT_MOC, QT_LIBS and QT_CFLAGS.
-dnl A fallback copy of "pkg.m4" should be included in the distribution.
+dnl Tests for Qt5. Sets gconfig_have_qt, QT_MOC, QT_LRELEASE, QT_LIBS and
+dnl QT_CFLAGS. A fallback copy of "pkg.m4" should be included in the
+dnl distribution.
 dnl
 AC_DEFUN([GCONFIG_FN_QT],
 [
-	# try pkg-config
+	# try pkg-config -- this says 'checking for QT'
 	PKG_CHECK_MODULES([QT],[Qt5Widgets > 5],
 		[
 			gconfig_pkgconfig_qt=yes
@@ -1867,23 +1580,36 @@ AC_DEFUN([GCONFIG_FN_QT],
 	)
 
 	# allow the moc command to be defined with QT_MOC on the configure
-	# command-line, typically with CXXFLAGS and LIBS pointing to Qt
+	# command-line, typically also with CXXFLAGS and LIBS pointing to Qt
 	# headers and libraries
 	AC_ARG_VAR([QT_MOC],[moc command for QT])
 
+	if echo "$QT_MOC" | grep -q /
+	then
+		QT_LRELEASE="`dirname \"$QT_MOC\"`/lrelease"
+	else
+		QT_LRELEASE="lrelease"
+	fi
+
 	# or build the moc command using pkg-config results
 	if test "$QT_MOC" = ""
 	then
 		if test "$gconfig_pkgconfig_qt" = "yes"
 		then
 			QT_MOC="`$PKG_CONFIG --variable=host_bins Qt5Core`/moc"
+			QT_LRELEASE="`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease"
 			QT_CHOOSER="`$PKG_CONFIG --variable=exec_prefix Qt5Core`/bin/qtchooser"
 			if test -x "$QT_MOC" ; then : ; else QT_MOC="" ; fi
+			if test -x "$QT_LRELEASE" ; then : ; else QT_LRELEASE="" ; fi
 			if test -x "$QT_CHOOSER" ; then : ; else QT_CHOOSER="" ; fi
 			if test "$QT_MOC" = "" -a "$QT_CHOOSER" != ""
 			then
 				QT_MOC="$QT_CHOOSER -run-tool=moc -qt=qt5"
 			fi
+			if test "$QT_LRELEASE" = "" -a "$QT_CHOOSER" != ""
+			then
+				QT_LRELEASE="$QT_CHOOSER -run-tool=lrelease -qt=qt5"
+			fi
 		fi
 	fi
 
@@ -1893,6 +1619,20 @@ AC_DEFUN([GCONFIG_FN_QT],
 		AC_PATH_PROG([QT_MOC],[moc])
 	fi
 
+	if test "$QT_LRELEASE" = ""
+	then
+		AC_PATH_PROG([QT_LRELEASE],[lrelease])
+		if test "$QT_LRELEASE" = ""
+		then
+			QT_LRELEASE=false
+		fi
+	fi
+
+	if test "$QT_MOC" != ""
+	then
+		AC_MSG_NOTICE([QT moc command: $QT_MOC])
+	fi
+
 	# set gconfig_have_qt, QT_CFLAGS and QT_LIBS iff we have a moc command
 	if test "$QT_MOC" != ""
 	then
@@ -1918,6 +1658,44 @@ AC_DEFUN([GCONFIG_FN_QT],
 	fi
 ])
 
+dnl GCONFIG_FN_QT_BUILD
+dnl -------------------
+dnl Tests for successful Qt5 compilation if GCONFIG_FN_QT
+dnl has set gconfig_have_qt. Sets gconfig_qt_build.
+dnl
+AC_DEFUN([GCONFIG_FN_QT_BUILD],
+[AC_CACHE_CHECK([for QT compilation],[gconfig_cv_qt_build],
+[
+	if test "$gconfig_have_qt" = "yes"
+	then
+		gconfig_save_LIBS="$LIBS"
+		gconfig_save_CXXFLAGS="$CXXFLAGS"
+		LIBS="$LIBS $QT_LIBS"
+		CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM(
+			[
+				[#include <QtCore/QtCore>]
+				[#if QT_VERSION < 0x050000]
+				[#error Qt is too old]
+				[#endif]
+				[#include <QtGui/QtGui>]
+				[#include <QtWidgets/QtWidgets>]
+				[#include <QtCore/QtPlugin>]
+			],
+			[
+				[throw QSize(1,1).width() ;]
+			])],
+			gconfig_cv_qt_build=yes ,
+			gconfig_cv_qt_build=no )
+		LIBS="$gconfig_save_LIBS"
+		CXXFLAGS="$gconfig_save_CXXFLAGS"
+	else
+		gconfig_cv_qt_build=no
+	fi
+])
+	gconfig_qt_build="$gconfig_cv_qt_build"
+])
+
 dnl GCONFIG_FN_READLINK
 dnl -------------------
 dnl Tests for readlink().
@@ -2048,6 +1826,10 @@ AC_DEFUN([GCONFIG_FN_SET_DIRECTORIES_E],
 	then
 		e_icondir="$datadir/$PACKAGE"
 	fi
+	if test "$e_trdir" = ""
+	then
+		e_trdir="$datadir/$PACKAGE"
+	fi
 	if test "$e_rundir" = ""
 	then
 		# (linux fhs says "/run", not "/var/run")
@@ -2064,6 +1846,7 @@ AC_DEFUN([GCONFIG_FN_SET_DIRECTORIES_E],
 	AC_SUBST([e_initdir])
 	AC_SUBST([e_bsdinitdir])
 	AC_SUBST([e_icondir])
+	AC_SUBST([e_trdir])
 	AC_SUBST([e_spooldir])
 	AC_SUBST([e_examplesdir])
 	AC_SUBST([e_libexecdir])
@@ -2134,13 +1917,14 @@ AC_DEFUN([GCONFIG_FN_SIGPROCMASK],
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 		[
 			[#include <csignal>]
+			[#include <cstddef>]
 			[sigset_t set ;]
 			[int rc ;]
 		],
 		[
 			[sigemptyset( &set ) ;]
 			[sigaddset( &set , SIGTERM ) ;]
-			[rc = sigprocmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , &set ) ;]
+			[rc = sigprocmask( SIG_BLOCK|SIG_UNBLOCK|SIG_SETMASK , &set , NULL ) ;]
 		])],
 		gconfig_cv_sigprocmask=yes ,
 		gconfig_cv_sigprocmask=no )
@@ -2463,6 +2247,8 @@ AC_DEFUN([GCONFIG_FN_TLS],
 		gconfig_ssl_notice="openssl and mbedtls"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=yes
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS="$gconfig_ssl_mbedtls_libs $gconfig_ssl_openssl_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "yes" -a "$gconfig_ssl_use_mbedtls" = "no"
@@ -2470,6 +2256,8 @@ AC_DEFUN([GCONFIG_FN_TLS],
 		gconfig_ssl_notice="openssl"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=yes
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS="$gconfig_ssl_openssl_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "no" -a "$gconfig_ssl_use_mbedtls" = "yes"
@@ -2477,6 +2265,8 @@ AC_DEFUN([GCONFIG_FN_TLS],
 		gconfig_ssl_notice="mbedtls"
 		gconfig_ssl_use_none=no
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=yes
 		GCONFIG_TLS_LIBS="$gconfig_ssl_mbedtls_libs"
 	fi
 	if test "$gconfig_ssl_use_openssl" = "no" -a "$gconfig_ssl_use_mbedtls" = "no"
@@ -2484,6 +2274,8 @@ AC_DEFUN([GCONFIG_FN_TLS],
 		gconfig_ssl_notice="none"
 		gconfig_ssl_use_none=yes
 		gconfig_ssl_use_both=no
+		gconfig_ssl_use_openssl_only=no
+		gconfig_ssl_use_mbedtls_only=no
 		GCONFIG_TLS_LIBS=""
 	fi
 
@@ -2494,8 +2286,8 @@ AC_DEFUN([GCONFIG_FN_TLS],
 
 	AC_SUBST([GCONFIG_TLS_LIBS])
 	AM_CONDITIONAL([GCONFIG_TLS_USE_BOTH],test "$gconfig_ssl_use_both" = "yes")
-	AM_CONDITIONAL([GCONFIG_TLS_USE_OPENSSL],test "$gconfig_ssl_use_openssl" = "yes")
-	AM_CONDITIONAL([GCONFIG_TLS_USE_MBEDTLS],test "$gconfig_ssl_use_mbedtls" = "yes")
+	AM_CONDITIONAL([GCONFIG_TLS_USE_OPENSSL],test "$gconfig_ssl_use_openssl_only" = "yes")
+	AM_CONDITIONAL([GCONFIG_TLS_USE_MBEDTLS],test "$gconfig_ssl_use_mbedtls_only" = "yes")
 	AM_CONDITIONAL([GCONFIG_TLS_USE_NONE],test "$gconfig_ssl_use_none" = "yes")
 	AC_MSG_NOTICE([using tls library: $gconfig_ssl_notice])
 ])
@@ -2811,6 +2603,35 @@ AC_DEFUN([GCONFIG_FN_TYPE_UINTPTR_T],
 	fi
 ])
 
+dnl GCONFIG_FN_UDS
+dnl --------------
+dnl Tests for unix domain socket support.
+dnl
+AC_DEFUN([GCONFIG_FN_UDS],
+[AC_CACHE_CHECK([for unix domain sockets],[gconfig_cv_uds],
+[
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+		[
+			[#include <sys/types.h>]
+			[#include <sys/socket.h>]
+			[#include <sys/un.h>]
+			[struct sockaddr_un a ;]
+		] ,
+		[
+			[a.sun_family = AF_UNIX | PF_UNIX ;]
+			[a.sun_path[0] = '\0' ;]
+		])] ,
+		[gconfig_cv_uds=yes],
+		[gconfig_cv_uds=no])
+])
+	if test "$gconfig_cv_uds" = "yes"
+	then
+		AC_DEFINE(GCONFIG_HAVE_UDS,1,[Define true to use unix domain sockets])
+	else
+		AC_DEFINE(GCONFIG_HAVE_UDS,0,[Define true to use unix domain sockets])
+	fi
+])
+
 dnl GCONFIG_FN_WARNINGS
 dnl -------------------
 dnl Displays a summary warning.
@@ -2857,18 +2678,25 @@ dnl relevant library code. See also AM_GNU_GETTEXT.
 dnl
 AC_DEFUN([GCONFIG_FN_WITH_GETTEXT],
 [
-	if test "$with_gettext" = "yes"
+	if test "$with_gettext" = "no"
 	then
-		gconfig_use_gettext="yes"
-	else
-		gconfig_use_gettext="no"
+		gconfig_cv_gettext="no"
+	:
+	elif test "$with_gettext" = "yes"
+	then
+		if test "$gconfig_cv_gettext" = "no"
+		then
+			AC_MSG_WARN([forcing use of gettext even though not detected])
+			gconfig_cv_gettext="yes"
+		fi
 	fi
 
-	if test "$gconfig_use_gettext" = "yes" ; then
-		AC_DEFINE(GCONFIG_HAVE_GETTEXT,1,[Define true to use GNU gettext])
+	if test "$gconfig_cv_gettext" = "yes" ; then
+		AC_DEFINE(GCONFIG_HAVE_GETTEXT,1,[Define true to use gettext])
 	else
-		AC_DEFINE(GCONFIG_HAVE_GETTEXT,0,[Define true to use GNU gettext])
+		AC_DEFINE(GCONFIG_HAVE_GETTEXT,0,[Define true to use gettext])
 	fi
+	AM_CONDITIONAL([GCONFIG_GETTEXT],[test "$gconfig_cv_gettext" = "yes"])
 ])
 
 dnl GCONFIG_FN_WITH_MAN2HTML
@@ -2937,3 +2765,24 @@ AC_DEFUN([GCONFIG_FN_WITH_PAM],
 	AM_CONDITIONAL([GCONFIG_PAM],[test "$gconfig_use_pam" = "yes"])
 ])
 
+dnl GCONFIG_FN_WITH_UDS
+dnl -------------------
+dnl Enables unix domain sockets if detected unless "--without-uds" is
+dnl used. Requires GCONFIG_FN_UDS to set gconfig_cv_uds.
+dnl Typically used after AC_ARG_WITH(uds).
+dnl
+AC_DEFUN([GCONFIG_FN_WITH_UDS],
+[
+	AC_REQUIRE([GCONFIG_FN_UDS])
+	if test "$with_uds" = "no"
+	then
+		AM_CONDITIONAL([GCONFIG_UDS],[false])
+	else
+		if test "$with_uds" = "yes" -a "$gconfig_cv_uds" = "no"
+		then
+			AC_MSG_WARN([forcing use of unix domain sockets even though not detected])
+		fi
+		AM_CONDITIONAL([GCONFIG_UDS],[true])
+	fi
+])
+
diff --git a/po/Makefile.in b/po/Makefile.in
index b5fb569..f00a006 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -126,7 +126,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -213,6 +213,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -249,6 +250,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -299,8 +301,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -318,7 +320,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d279b6a..1dc22b9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -120,6 +120,7 @@
 ./src/gnet/geventloop_epoll.cpp
 ./src/gnet/geventloop.cpp
 ./src/gnet/ginterfaces_common.cpp
+./src/gnet/gaddresslocal_unix.cpp
 ./src/gnet/gmonitor.cpp
 ./src/gnet/ginterfaces_unix.cpp
 ./src/gnet/gclientptr.cpp
@@ -131,6 +132,7 @@
 ./src/gnet/gaddress4.cpp
 ./src/gnet/gresolver.cpp
 ./src/gnet/glinebuffer.cpp
+./src/gnet/gaddresslocal_none.cpp
 ./src/gnet/gsocket.cpp
 ./src/gnet/glocal.cpp
 ./src/gnet/glocation.cpp
diff --git a/src/Makefile.in b/src/Makefile.in
index 2234321..9fceef5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -135,8 +135,9 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)gconfig_defs.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -156,7 +157,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gconfig_defs.h.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -245,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -281,6 +283,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -310,7 +313,8 @@ top_srcdir = @top_srcdir@
 SUBDIRS = glib gssl gnet gauth gsmtp gpop win32 main gui
 EXTRA_DIST = .clang-tidy .clang-format
 CLEANFILES = compile_commands.json
-all: all-recursive
+all: gconfig_defs.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -330,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -343,6 +347,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
+gconfig_defs.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/gconfig_defs.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status src/gconfig_defs.h
+$(srcdir)/gconfig_defs.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f gconfig_defs.h stamp-h1
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
@@ -442,7 +461,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -499,7 +521,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile gconfig_defs.h
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -539,7 +561,7 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
@@ -599,19 +621,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic cscopelist-am ctags ctags-am \
-	distclean distclean-generic distclean-tags distdir dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+	distclean distclean-generic distclean-hdr distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/gauth/Makefile.in b/src/gauth/Makefile.in
index 16ed767..0281427 100644
--- a/src/gauth/Makefile.in
+++ b/src/gauth/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -139,9 +139,18 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gcram.Po ./$(DEPDIR)/gsaslclient.Po \
+	./$(DEPDIR)/gsaslclientsecrets.Po ./$(DEPDIR)/gsaslserver.Po \
+	./$(DEPDIR)/gsaslserverbasic.Po \
+	./$(DEPDIR)/gsaslserverfactory_basic.Po \
+	./$(DEPDIR)/gsaslserverfactory_pam.Po \
+	./$(DEPDIR)/gsaslserverpam.Po \
+	./$(DEPDIR)/gsaslserversecrets.Po ./$(DEPDIR)/gsecret.Po \
+	./$(DEPDIR)/gsecrets.Po ./$(DEPDIR)/gsecretsfile.Po \
+	./$(DEPDIR)/gvalid.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -258,6 +267,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -294,6 +304,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -391,8 +402,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -418,19 +429,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcram.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslclientsecrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverbasic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverfactory_basic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverfactory_pam.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverpam.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserversecrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecret.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecretsfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvalid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcram.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslclientsecrets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverbasic.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverfactory_basic.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverfactory_pam.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserverpam.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsaslserversecrets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecret.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecrets.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsecretsfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvalid.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -498,7 +515,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -567,7 +587,19 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gcram.Po
+	-rm -f ./$(DEPDIR)/gsaslclient.Po
+	-rm -f ./$(DEPDIR)/gsaslclientsecrets.Po
+	-rm -f ./$(DEPDIR)/gsaslserver.Po
+	-rm -f ./$(DEPDIR)/gsaslserverbasic.Po
+	-rm -f ./$(DEPDIR)/gsaslserverfactory_basic.Po
+	-rm -f ./$(DEPDIR)/gsaslserverfactory_pam.Po
+	-rm -f ./$(DEPDIR)/gsaslserverpam.Po
+	-rm -f ./$(DEPDIR)/gsaslserversecrets.Po
+	-rm -f ./$(DEPDIR)/gsecret.Po
+	-rm -f ./$(DEPDIR)/gsecrets.Po
+	-rm -f ./$(DEPDIR)/gsecretsfile.Po
+	-rm -f ./$(DEPDIR)/gvalid.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -613,7 +645,19 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gcram.Po
+	-rm -f ./$(DEPDIR)/gsaslclient.Po
+	-rm -f ./$(DEPDIR)/gsaslclientsecrets.Po
+	-rm -f ./$(DEPDIR)/gsaslserver.Po
+	-rm -f ./$(DEPDIR)/gsaslserverbasic.Po
+	-rm -f ./$(DEPDIR)/gsaslserverfactory_basic.Po
+	-rm -f ./$(DEPDIR)/gsaslserverfactory_pam.Po
+	-rm -f ./$(DEPDIR)/gsaslserverpam.Po
+	-rm -f ./$(DEPDIR)/gsaslserversecrets.Po
+	-rm -f ./$(DEPDIR)/gsecret.Po
+	-rm -f ./$(DEPDIR)/gsecrets.Po
+	-rm -f ./$(DEPDIR)/gsecretsfile.Po
+	-rm -f ./$(DEPDIR)/gvalid.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -633,18 +677,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/gconfig_defs.h.in b/src/gconfig_defs.h.in
similarity index 86%
rename from gconfig_defs.h.in
rename to src/gconfig_defs.h.in
index 67fd6e3..df6b9f4 100644
--- a/gconfig_defs.h.in
+++ b/src/gconfig_defs.h.in
@@ -1,4 +1,4 @@
-/* gconfig_defs.h.in.  Generated from configure.ac by autoheader.  */
+/* src/gconfig_defs.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define true to use epoll */
 #undef GCONFIG_ENABLE_EPOLL
@@ -15,54 +15,12 @@
 /* Define true if compiler has std::align() */
 #undef GCONFIG_HAVE_CXX_ALIGNMENT
 
-/* Define true if compiler supports c++ constexpr */
-#undef GCONFIG_HAVE_CXX_CONSTEXPR
-
-/* Define true if compiler supports c++ =default */
-#undef GCONFIG_HAVE_CXX_DEFAULTED
-
-/* Define true if compiler supports c++ =delete */
-#undef GCONFIG_HAVE_CXX_DELETED
-
-/* Define true if compiler has std::vector::emplace_back() */
-#undef GCONFIG_HAVE_CXX_EMPLACE
-
-/* Define true if compiler supports c++ class enums */
-#undef GCONFIG_HAVE_CXX_ENUM_CLASS
-
-/* Define true if compiler supports c++ final keyword */
-#undef GCONFIG_HAVE_CXX_FINAL
-
-/* Define true if compiler supports c++ initializer_list */
-#undef GCONFIG_HAVE_CXX_INITIALIZER_LIST
-
 /* Define true if compiler has std::make_unique */
 #undef GCONFIG_HAVE_CXX_MAKE_UNIQUE
 
-/* Define true if compiler has std::move() */
-#undef GCONFIG_HAVE_CXX_MOVE
-
-/* Define true if compiler supports c++ noexcept */
-#undef GCONFIG_HAVE_CXX_NOEXCEPT
-
-/* Define true if compiler supports c++ nullptr */
-#undef GCONFIG_HAVE_CXX_NULLPTR
-
-/* Define true if compiler supports c++ override */
-#undef GCONFIG_HAVE_CXX_OVERRIDE
-
-/* Define true if compiler has std::shared_ptr */
-#undef GCONFIG_HAVE_CXX_SHARED_PTR
-
 /* Define true if compiler has std::thread */
 #undef GCONFIG_HAVE_CXX_STD_THREAD
 
-/* Define true if compiler has std::wstring */
-#undef GCONFIG_HAVE_CXX_STD_WSTRING
-
-/* Define true if compiler has <type_traits> make_unsigned */
-#undef GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED
-
 /* Define true to enable use of epoll */
 #undef GCONFIG_HAVE_EPOLL
 
@@ -99,7 +57,7 @@
 /* Define true if getpwnam_r in pwd.h */
 #undef GCONFIG_HAVE_GETPWNAM_R
 
-/* Define true to use GNU gettext */
+/* Define true to use gettext */
 #undef GCONFIG_HAVE_GETTEXT
 
 /* Define true if gid_t is a type */
@@ -138,6 +96,9 @@
 /* Define true if inttypes.h is available */
 #undef GCONFIG_HAVE_INTTYPES_H
 
+/* Define true if struct iovec has a simple layout */
+#undef GCONFIG_HAVE_IOVEC_SIMPLE
+
 /* Define true if ipv6 is available */
 #undef GCONFIG_HAVE_IPV6
 
@@ -264,6 +225,9 @@
 /* Define true if sys/wait.h is available */
 #undef GCONFIG_HAVE_SYS_WAIT_H
 
+/* Define true to use unix domain sockets */
+#undef GCONFIG_HAVE_UDS
+
 /* Define true if uid_t is a type */
 #undef GCONFIG_HAVE_UID_T
 
diff --git a/src/glib/Makefile.in b/src/glib/Makefile.in
index d923894..0dd7cab 100644
--- a/src/glib/Makefile.in
+++ b/src/glib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -222,9 +222,40 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/garg.Po ./$(DEPDIR)/gbase64.Po \
+	./$(DEPDIR)/gbatchfile.Po ./$(DEPDIR)/gcleanup_unix.Po \
+	./$(DEPDIR)/gcleanup_win32.Po ./$(DEPDIR)/gconvert.Po \
+	./$(DEPDIR)/gconvert_win32.Po ./$(DEPDIR)/gdaemon_unix.Po \
+	./$(DEPDIR)/gdaemon_win32.Po ./$(DEPDIR)/gdate.Po \
+	./$(DEPDIR)/gdatetime.Po ./$(DEPDIR)/gdirectory.Po \
+	./$(DEPDIR)/gdirectory_unix.Po ./$(DEPDIR)/gdirectory_win32.Po \
+	./$(DEPDIR)/genvironment.Po ./$(DEPDIR)/genvironment_unix.Po \
+	./$(DEPDIR)/genvironment_win32.Po ./$(DEPDIR)/gexception.Po \
+	./$(DEPDIR)/gexecutablecommand.Po \
+	./$(DEPDIR)/gexecutablecommand_unix.Po \
+	./$(DEPDIR)/gexecutablecommand_win32.Po ./$(DEPDIR)/gfile.Po \
+	./$(DEPDIR)/gfile_unix.Po ./$(DEPDIR)/gfile_win32.Po \
+	./$(DEPDIR)/gformat.Po ./$(DEPDIR)/ggetopt.Po \
+	./$(DEPDIR)/ghash.Po ./$(DEPDIR)/ghostname_unix.Po \
+	./$(DEPDIR)/ghostname_win32.Po ./$(DEPDIR)/gidentity_unix.Po \
+	./$(DEPDIR)/gidentity_win32.Po ./$(DEPDIR)/glog.Po \
+	./$(DEPDIR)/glogoutput.Po ./$(DEPDIR)/glogoutput_unix.Po \
+	./$(DEPDIR)/glogoutput_win32.Po ./$(DEPDIR)/gmapfile.Po \
+	./$(DEPDIR)/gmd5.Po ./$(DEPDIR)/gmsg_unix.Po \
+	./$(DEPDIR)/gmsg_win32.Po ./$(DEPDIR)/gnewprocess_unix.Po \
+	./$(DEPDIR)/gnewprocess_win32.Po ./$(DEPDIR)/goptionmap.Po \
+	./$(DEPDIR)/goptionparser.Po ./$(DEPDIR)/goptions.Po \
+	./$(DEPDIR)/gpam_linux.Po ./$(DEPDIR)/gpam_none.Po \
+	./$(DEPDIR)/gpath.Po ./$(DEPDIR)/gpidfile.Po \
+	./$(DEPDIR)/gprocess_unix.Po ./$(DEPDIR)/gprocess_win32.Po \
+	./$(DEPDIR)/grandom.Po ./$(DEPDIR)/greadwrite.Po \
+	./$(DEPDIR)/groot.Po ./$(DEPDIR)/gslot.Po ./$(DEPDIR)/gstr.Po \
+	./$(DEPDIR)/gstringwrap.Po ./$(DEPDIR)/gtest.Po \
+	./$(DEPDIR)/gthread.Po ./$(DEPDIR)/gtime.Po \
+	./$(DEPDIR)/gxtext.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -341,6 +372,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -377,6 +409,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -672,8 +705,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -699,66 +732,72 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbase64.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbatchfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcleanup_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcleanup_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconvert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconvert_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdaemon_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdaemon_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdatetime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexception.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gformat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ggetopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghostname_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghostname_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gidentity_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gidentity_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmapfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmd5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmsg_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmsg_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewprocess_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewprocess_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptionmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptionparser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpam_linux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpam_none.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpath.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpidfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprocess_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprocess_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grandom.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/greadwrite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groot.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gslot.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstringwrap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxtext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbase64.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbatchfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcleanup_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcleanup_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconvert.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconvert_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdaemon_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdaemon_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdatetime.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdirectory_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvironment_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexception.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablecommand_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gformat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ggetopt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghostname_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghostname_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gidentity_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gidentity_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glogoutput_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmapfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmd5.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmsg_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmsg_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewprocess_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewprocess_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptionmap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptionparser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goptions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpam_linux.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpam_none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpidfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprocess_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprocess_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grandom.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/greadwrite.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groot.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gslot.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstringwrap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthread.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtime.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gxtext.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -826,7 +865,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -895,7 +937,66 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/garg.Po
+	-rm -f ./$(DEPDIR)/gbase64.Po
+	-rm -f ./$(DEPDIR)/gbatchfile.Po
+	-rm -f ./$(DEPDIR)/gcleanup_unix.Po
+	-rm -f ./$(DEPDIR)/gcleanup_win32.Po
+	-rm -f ./$(DEPDIR)/gconvert.Po
+	-rm -f ./$(DEPDIR)/gconvert_win32.Po
+	-rm -f ./$(DEPDIR)/gdaemon_unix.Po
+	-rm -f ./$(DEPDIR)/gdaemon_win32.Po
+	-rm -f ./$(DEPDIR)/gdate.Po
+	-rm -f ./$(DEPDIR)/gdatetime.Po
+	-rm -f ./$(DEPDIR)/gdirectory.Po
+	-rm -f ./$(DEPDIR)/gdirectory_unix.Po
+	-rm -f ./$(DEPDIR)/gdirectory_win32.Po
+	-rm -f ./$(DEPDIR)/genvironment.Po
+	-rm -f ./$(DEPDIR)/genvironment_unix.Po
+	-rm -f ./$(DEPDIR)/genvironment_win32.Po
+	-rm -f ./$(DEPDIR)/gexception.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand_unix.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand_win32.Po
+	-rm -f ./$(DEPDIR)/gfile.Po
+	-rm -f ./$(DEPDIR)/gfile_unix.Po
+	-rm -f ./$(DEPDIR)/gfile_win32.Po
+	-rm -f ./$(DEPDIR)/gformat.Po
+	-rm -f ./$(DEPDIR)/ggetopt.Po
+	-rm -f ./$(DEPDIR)/ghash.Po
+	-rm -f ./$(DEPDIR)/ghostname_unix.Po
+	-rm -f ./$(DEPDIR)/ghostname_win32.Po
+	-rm -f ./$(DEPDIR)/gidentity_unix.Po
+	-rm -f ./$(DEPDIR)/gidentity_win32.Po
+	-rm -f ./$(DEPDIR)/glog.Po
+	-rm -f ./$(DEPDIR)/glogoutput.Po
+	-rm -f ./$(DEPDIR)/glogoutput_unix.Po
+	-rm -f ./$(DEPDIR)/glogoutput_win32.Po
+	-rm -f ./$(DEPDIR)/gmapfile.Po
+	-rm -f ./$(DEPDIR)/gmd5.Po
+	-rm -f ./$(DEPDIR)/gmsg_unix.Po
+	-rm -f ./$(DEPDIR)/gmsg_win32.Po
+	-rm -f ./$(DEPDIR)/gnewprocess_unix.Po
+	-rm -f ./$(DEPDIR)/gnewprocess_win32.Po
+	-rm -f ./$(DEPDIR)/goptionmap.Po
+	-rm -f ./$(DEPDIR)/goptionparser.Po
+	-rm -f ./$(DEPDIR)/goptions.Po
+	-rm -f ./$(DEPDIR)/gpam_linux.Po
+	-rm -f ./$(DEPDIR)/gpam_none.Po
+	-rm -f ./$(DEPDIR)/gpath.Po
+	-rm -f ./$(DEPDIR)/gpidfile.Po
+	-rm -f ./$(DEPDIR)/gprocess_unix.Po
+	-rm -f ./$(DEPDIR)/gprocess_win32.Po
+	-rm -f ./$(DEPDIR)/grandom.Po
+	-rm -f ./$(DEPDIR)/greadwrite.Po
+	-rm -f ./$(DEPDIR)/groot.Po
+	-rm -f ./$(DEPDIR)/gslot.Po
+	-rm -f ./$(DEPDIR)/gstr.Po
+	-rm -f ./$(DEPDIR)/gstringwrap.Po
+	-rm -f ./$(DEPDIR)/gtest.Po
+	-rm -f ./$(DEPDIR)/gthread.Po
+	-rm -f ./$(DEPDIR)/gtime.Po
+	-rm -f ./$(DEPDIR)/gxtext.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -941,7 +1042,66 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/garg.Po
+	-rm -f ./$(DEPDIR)/gbase64.Po
+	-rm -f ./$(DEPDIR)/gbatchfile.Po
+	-rm -f ./$(DEPDIR)/gcleanup_unix.Po
+	-rm -f ./$(DEPDIR)/gcleanup_win32.Po
+	-rm -f ./$(DEPDIR)/gconvert.Po
+	-rm -f ./$(DEPDIR)/gconvert_win32.Po
+	-rm -f ./$(DEPDIR)/gdaemon_unix.Po
+	-rm -f ./$(DEPDIR)/gdaemon_win32.Po
+	-rm -f ./$(DEPDIR)/gdate.Po
+	-rm -f ./$(DEPDIR)/gdatetime.Po
+	-rm -f ./$(DEPDIR)/gdirectory.Po
+	-rm -f ./$(DEPDIR)/gdirectory_unix.Po
+	-rm -f ./$(DEPDIR)/gdirectory_win32.Po
+	-rm -f ./$(DEPDIR)/genvironment.Po
+	-rm -f ./$(DEPDIR)/genvironment_unix.Po
+	-rm -f ./$(DEPDIR)/genvironment_win32.Po
+	-rm -f ./$(DEPDIR)/gexception.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand_unix.Po
+	-rm -f ./$(DEPDIR)/gexecutablecommand_win32.Po
+	-rm -f ./$(DEPDIR)/gfile.Po
+	-rm -f ./$(DEPDIR)/gfile_unix.Po
+	-rm -f ./$(DEPDIR)/gfile_win32.Po
+	-rm -f ./$(DEPDIR)/gformat.Po
+	-rm -f ./$(DEPDIR)/ggetopt.Po
+	-rm -f ./$(DEPDIR)/ghash.Po
+	-rm -f ./$(DEPDIR)/ghostname_unix.Po
+	-rm -f ./$(DEPDIR)/ghostname_win32.Po
+	-rm -f ./$(DEPDIR)/gidentity_unix.Po
+	-rm -f ./$(DEPDIR)/gidentity_win32.Po
+	-rm -f ./$(DEPDIR)/glog.Po
+	-rm -f ./$(DEPDIR)/glogoutput.Po
+	-rm -f ./$(DEPDIR)/glogoutput_unix.Po
+	-rm -f ./$(DEPDIR)/glogoutput_win32.Po
+	-rm -f ./$(DEPDIR)/gmapfile.Po
+	-rm -f ./$(DEPDIR)/gmd5.Po
+	-rm -f ./$(DEPDIR)/gmsg_unix.Po
+	-rm -f ./$(DEPDIR)/gmsg_win32.Po
+	-rm -f ./$(DEPDIR)/gnewprocess_unix.Po
+	-rm -f ./$(DEPDIR)/gnewprocess_win32.Po
+	-rm -f ./$(DEPDIR)/goptionmap.Po
+	-rm -f ./$(DEPDIR)/goptionparser.Po
+	-rm -f ./$(DEPDIR)/goptions.Po
+	-rm -f ./$(DEPDIR)/gpam_linux.Po
+	-rm -f ./$(DEPDIR)/gpam_none.Po
+	-rm -f ./$(DEPDIR)/gpath.Po
+	-rm -f ./$(DEPDIR)/gpidfile.Po
+	-rm -f ./$(DEPDIR)/gprocess_unix.Po
+	-rm -f ./$(DEPDIR)/gprocess_win32.Po
+	-rm -f ./$(DEPDIR)/grandom.Po
+	-rm -f ./$(DEPDIR)/greadwrite.Po
+	-rm -f ./$(DEPDIR)/groot.Po
+	-rm -f ./$(DEPDIR)/gslot.Po
+	-rm -f ./$(DEPDIR)/gstr.Po
+	-rm -f ./$(DEPDIR)/gstringwrap.Po
+	-rm -f ./$(DEPDIR)/gtest.Po
+	-rm -f ./$(DEPDIR)/gthread.Po
+	-rm -f ./$(DEPDIR)/gtime.Po
+	-rm -f ./$(DEPDIR)/gxtext.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -961,18 +1121,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/glib/gcleanup.h b/src/glib/gcleanup.h
index 812710c..9818cdb 100644
--- a/src/glib/gcleanup.h
+++ b/src/glib/gcleanup.h
@@ -76,6 +76,14 @@ public:
 	static void release() noexcept ;
 		///< Releases block()ed signals.
 
+	static const char * strdup( const char * ) ;
+		///< A strdup() function that makes it clear in the stack trace
+		///< that leaks are expected.
+
+	static const char * strdup( const std::string & ) ;
+		///< A strdup() function that makes it clear in the stack trace
+		///< that leaks are expected.
+
 public:
 	Cleanup() = delete ;
 } ;
diff --git a/src/glib/gcleanup_unix.cpp b/src/glib/gcleanup_unix.cpp
index fd65b14..4234d86 100644
--- a/src/glib/gcleanup_unix.cpp
+++ b/src/glib/gcleanup_unix.cpp
@@ -23,6 +23,7 @@
 #include "gprocess.h"
 #include "groot.h"
 #include "glog.h"
+#include <cstring> // ::strdup()
 #include <csignal> // ::sigaction() etc
 #include <array>
 
@@ -71,6 +72,9 @@ public:
 	static void release() noexcept ;
 		// Releases blocked signals.
 
+	static const char * strdup_ignore_leaks( const char * p ) ;
+		// A strdup() function.
+
 private:
 	struct Link /// A private linked-list structure used by G::CleanupImp.
 	{
@@ -129,6 +133,16 @@ void G::Cleanup::release() noexcept
 	CleanupImp::release() ;
 }
 
+const char * G::Cleanup::strdup( const char * p )
+{
+	return CleanupImp::strdup_ignore_leaks( p ) ;
+}
+
+const char * G::Cleanup::strdup( const std::string & s )
+{
+	return CleanupImp::strdup_ignore_leaks( s.c_str() ) ;
+}
+
 // ===
 
 void G::CleanupImp::init()
@@ -283,3 +297,8 @@ void G::CleanupImp::release() noexcept
 	gdef_pthread_sigmask( SIG_SETMASK , &set , nullptr ) ;
 }
 
+const char * G::CleanupImp::strdup_ignore_leaks( const char * p )
+{
+	return ::strdup( p ) ; // NOLINT
+}
+
diff --git a/src/glib/gcleanup_win32.cpp b/src/glib/gcleanup_win32.cpp
index 1fd64bb..ec36eef 100644
--- a/src/glib/gcleanup_win32.cpp
+++ b/src/glib/gcleanup_win32.cpp
@@ -20,6 +20,7 @@
 
 #include "gdef.h"
 #include "gcleanup.h"
+#include <cstring> // _strdup()
 
 void G::Cleanup::init()
 {
@@ -46,3 +47,20 @@ void G::Cleanup::release() noexcept
 	// not implemented
 }
 
+namespace
+{
+	const char * strdup_ignore_leaks( const char * p )
+	{
+		return _strdup( p ) ; // NOLINT
+	}
+}
+
+const char * G::Cleanup::strdup( const char * p )
+{
+	return strdup_ignore_leaks( p ) ;
+}
+
+const char * G::Cleanup::strdup( const std::string & s )
+{
+	return strdup_ignore_leaks( s.c_str() ) ;
+}
diff --git a/src/glib/gdef.h b/src/glib/gdef.h
index e1c028f..eae03cb 100644
--- a/src/glib/gdef.h
+++ b/src/glib/gdef.h
@@ -700,6 +700,13 @@
 			#define GCONFIG_HAVE_PTHREAD_SIGMASK 0
 		#endif
 	#endif
+	#if !defined(GCONFIG_HAVE_UDS)
+		#ifdef G_UNIX
+			#define GCONFIG_HAVE_UDS 1
+		#else
+			#define GCONFIG_HAVE_UDS 0
+		#endif
+	#endif
 
 	/* Include early o/s headers
 	 */
diff --git a/src/glib/gdirectory_unix.cpp b/src/glib/gdirectory_unix.cpp
index 8e146de..ab09b29 100644
--- a/src/glib/gdirectory_unix.cpp
+++ b/src/glib/gdirectory_unix.cpp
@@ -94,14 +94,8 @@ int G::Directory::usable( bool for_creation ) const
 
 bool G::Directory::writeable( const std::string & filename ) const
 {
-	// use open(2) so we can use O_EXCL, ie. fail if it already exists
 	Path path( m_path , filename.empty() ? tmp() : filename ) ;
-	int fd = ::open( path.cstr() , O_WRONLY | O_CREAT | O_EXCL , S_IRWXU ) ;
-	if( fd == -1 )
-		return false ;
-
-	::close( fd ) ;
-	return 0 == std::remove( path.cstr() ) ;
+	return File::probe( path.cstr() ) ;
 }
 
 // ===
diff --git a/src/glib/gdirectory_win32.cpp b/src/glib/gdirectory_win32.cpp
index 8865645..7c968a2 100644
--- a/src/glib/gdirectory_win32.cpp
+++ b/src/glib/gdirectory_win32.cpp
@@ -54,10 +54,7 @@ int G::Directory::usable( bool for_creation ) const
 bool G::Directory::writeable( const std::string & filename ) const
 {
 	Path path( m_path , filename.empty() ? tmp() : filename ) ;
-	int fd = -1 ;
-	const int oflags = _O_WRONLY | _O_CREAT | _O_EXCL | _O_TEMPORARY ;
-	errno_t e = _sopen_s( &fd , path.cstr() , oflags , _SH_DENYNO , _S_IWRITE ) ;
-	return e == 0 && fd != -1 && 0 == _close( fd ) ; // close and delete
+	return File::probe( path.cstr() ) ;
 }
 
 // ===
diff --git a/src/glib/gfile.h b/src/glib/gfile.h
index 4f6affe..b5908c6 100644
--- a/src/glib/gfile.h
+++ b/src/glib/gfile.h
@@ -106,18 +106,29 @@ public:
 		///< if necessary. Returns false on error.
 
 	static bool mkdirs( const Path & dir , std::nothrow_t , int = 100 ) ;
-		///< Creates a directory and all necessary parents. Returns false on error.
+		///< Creates a directory and all necessary parents.
 		///< Does chmodx() on all created directories.
+		///< Returns false on error, but EEXIST is not
+		///< an error and chmod errors are also ignored.
+		///<
+		///< Note that the EEXIST result is ignored even if
+		///< the target path already exists as a non-directory.
+		///< This is a feature not a bug because it can avoid
+		///< races.
 
 	static void mkdirs( const Path & dir , int = 100 ) ;
 		///< Creates a directory and all necessary parents.
-		///< Does chmodx() on all created directories.
+		///< Does chmodx() on all created directories.	
+		///< Throws on error, but EEXIST is not an error
+		///< and chmod errors are also ignored.
 
 	static bool mkdir( const Path & dir , std::nothrow_t ) ;
-		///< Creates a directory. Returns false on error.
+		///< Creates a directory. Returns false on error
+		///< (including EEXIST).
 
 	static void mkdir( const Path & dir ) ;
-		///< Creates a directory.
+		///< Creates a directory. Throws on error (including
+		///< EEXIST).
 
 	static bool isEmpty( const Path & file , std::nothrow_t ) ;
 		///< Returns true if the file size is zero.
@@ -228,6 +239,10 @@ public:
 		///< Opens a file descriptor. Returns -1 on error.
 		///< Uses SH_DENYNO and O_BINARY on windows.
 
+	static bool probe( const char * ) noexcept ;
+		///< Creates and deletes a temporary probe file. Fails if
+		///< the file already exists. Returns false on error.
+
 	static ssize_t read( int fd , char * , std::size_t ) noexcept ;
 		///< Calls ::read() or equivalent.
 
@@ -254,7 +269,7 @@ private:
 	static Stat statImp( const char * , bool = false ) noexcept ;
 	static bool rename( const char * , const char * to , bool & enoent ) noexcept ;
 	static bool chmodx( const Path & file , bool ) ;
-	static int link( const char * , const char * ) ;
+	static int linkImp( const char * , const char * ) ;
 	static bool linked( const Path & , const Path & ) ;
 	static int mkdirImp( const Path & dir ) noexcept ;
 	static bool mkdirsr( int * , const Path & dir , int ) ;
diff --git a/src/glib/gfile_unix.cpp b/src/glib/gfile_unix.cpp
index 18407d6..2390f48 100644
--- a/src/glib/gfile_unix.cpp
+++ b/src/glib/gfile_unix.cpp
@@ -88,16 +88,26 @@ std::filebuf * G::File::open( std::filebuf & fb , const Path & path , InOut inou
 int G::File::open( const char * path , InOutAppend mode ) noexcept
 {
 	if( mode == InOutAppend::In )
-		return ::open( path , O_RDONLY ) ;
+		return ::open( path , O_RDONLY ) ; // NOLINT
 	else if( mode == InOutAppend::Out )
-		return ::open( path , O_WRONLY|O_CREAT|O_TRUNC , 0666 ) ;
+		return ::open( path , O_WRONLY|O_CREAT|O_TRUNC , 0666 ) ; // NOLINT
 	else
-		return ::open( path , O_WRONLY|O_CREAT|O_APPEND , 0666 ) ;
+		return ::open( path , O_WRONLY|O_CREAT|O_APPEND , 0666 ) ; // NOLINT
+}
+
+bool G::File::probe( const char * path ) noexcept
+{
+	int fd = ::open( path , O_WRONLY|O_CREAT|O_EXCL , 0666 ) ; // NOLINT
+	if( fd < 0 )
+		return false ;
+	std::remove( path ) ;
+	::close( fd ) ;
+	return true ;
 }
 
 void G::File::create( const Path & path )
 {
-	int fd = ::open( path.cstr() , O_RDONLY|O_CREAT , 0666 ) ;
+	int fd = ::open( path.cstr() , O_RDONLY|O_CREAT , 0666 ) ; // NOLINT
 	if( fd < 0 )
 		throw CannotCreate( path.str() ) ;
 	::close( fd ) ;
@@ -121,12 +131,16 @@ void G::File::close( int fd ) noexcept
 int G::File::mkdirImp( const Path & dir ) noexcept
 {
 	int rc = ::mkdir( dir.cstr() , 0777 ) ; // open permissions, but limited by umask
-	if( rc != 0 )
+	if( rc == 0 )
 	{
-		rc = G::Process::errno_() ;
-		if( rc == 0 ) rc = EINVAL ;
+		return 0 ;
+	}
+	else
+	{
+		int e = G::Process::errno_() ;
+		if( e == 0 ) e = EINVAL ;
+		return e ;
 	}
-	return rc ;
 }
 
 G::File::Stat G::File::statImp( const char * path , bool link ) noexcept
@@ -138,15 +152,15 @@ G::File::Stat G::File::statImp( const char * path , bool link ) noexcept
 		s.error = 0 ;
 		s.enoent = false ;
 		s.eaccess = false ;
-		s.is_link = (statbuf.st_mode & S_IFLNK) ;
-		s.is_dir = (statbuf.st_mode & S_IFDIR) ;
-		s.is_executable = !!(statbuf.st_mode & S_IXUSR) && !!(statbuf.st_mode & S_IRUSR) ; // indicitive
+		s.is_link = (statbuf.st_mode & S_IFMT) == S_IFLNK ; // NOLINT
+		s.is_dir = (statbuf.st_mode & S_IFMT) == S_IFDIR ; // NOLINT
+		s.is_executable = !!(statbuf.st_mode & S_IXUSR) && !!(statbuf.st_mode & S_IRUSR) ; // indicitive // NOLINT
 		s.is_empty = statbuf.st_size == 0 ;
 		s.mtime_s = FileImp::mtime(statbuf).first ;
 		s.mtime_us = FileImp::mtime(statbuf).second ;
-		s.mode = static_cast<unsigned long>( statbuf.st_mode & 07777 ) ;
+		s.mode = static_cast<unsigned long>( statbuf.st_mode & mode_t(07777) ) ; // NOLINT
 		s.size = static_cast<unsigned long long>( statbuf.st_size ) ;
-		s.blocks = static_cast<unsigned long long>( statbuf.st_size >> 24 ) ;
+		s.blocks = static_cast<unsigned long long>(statbuf.st_size) >> 24U ;
 	}
 	else
 	{
@@ -174,9 +188,9 @@ bool G::File::chmodx( const Path & path , bool do_throw )
 	Stat s = statImp( path.cstr() ) ;
 	mode_t mode = s.error ? mode_t(0777) : mode_t(s.mode) ;
 
-	mode |= ( S_IRUSR | S_IXUSR ) ; // add user-read and user-executable
-	if( mode & S_IRGRP ) mode |= S_IXGRP ; // add group-executable iff group-read
-	if( mode & S_IROTH ) mode |= S_IXOTH ; // add world-executable iff world-read
+	mode |= ( S_IRUSR | S_IXUSR ) ; // add user-read and user-executable // NOLINT
+	if( mode & S_IRGRP ) mode |= S_IXGRP ; // add group-executable iff group-read // NOLINT
+	if( mode & S_IROTH ) mode |= S_IXOTH ; // add world-executable iff world-read // NOLINT
 
 	// apply the current umask
 	mode_t mask = ::umask( 0 ) ; ::umask( mask ) ;
@@ -217,7 +231,7 @@ bool G::File::chmod( const Path & path , const std::string & spec , std::nothrow
 
 std::pair<bool,mode_t> G::FileImp::newmode( mode_t mode , const std::string & spec_in )
 {
-	mode &= 07777 ;
+	mode &= mode_t(07777) ;
 	G::StringArray spec_list = G::Str::splitIntoFields( spec_in , "," ) ;
 	bool ok = !spec_list.empty() ;
 	for( auto spec : spec_list )
@@ -236,25 +250,25 @@ std::pair<bool,mode_t> G::FileImp::newmode( mode_t mode , const std::string & sp
 			for( const char * p = spec.c_str()+2 ; *p ; p++ )
 			{
 				if( *p == 'r' )
-					part |= 4 ;
+					part |= mode_t(4) ;
 				else if( *p == 'w' )
-					part |= 2 ;
+					part |= mode_t(2) ;
 				else if( *p == 'x' )
-					part |= 1 ;
+					part |= mode_t(1) ;
 				else if( *p == 's' && spec[0] == 'u' )
-					special |= S_ISUID ;
+					special |= S_ISUID ; // NOLINT
 				else if( *p == 's' && spec[0] == 'g' )
-					special |= S_ISGID ;
+					special |= S_ISGID ; // NOLINT
 				else if( *p == 't' && spec[0] == 'o' )
-					special |= S_ISVTX ;
+					special |= S_ISVTX ; // NOLINT
 				else
 					ok = false ;
 			}
-			int shift = spec[0]=='u' ? 6 : (spec[0]=='g'?3:0) ;
+			unsigned int shift = spec[0]=='u' ? 6U : (spec[0]=='g'?3U:0U) ;
 			if( spec[0] == 'a' )
 			{
 				mode_t mask = umask(0) ; umask( mask ) ;
-				part = ( ((part<<6)|(part<<3)|part) & ~mask ) ;
+				part = ( ((part<<6U)|(part<<3U)|part) & ~mask ) ;
 			}
 			if( spec[1] == '=' && spec[0] == 'a' )
 			{
@@ -262,7 +276,7 @@ std::pair<bool,mode_t> G::FileImp::newmode( mode_t mode , const std::string & sp
 			}
 			else if( spec[1] == '=' )
 			{
-				mode_t clearbits = (7<<shift) | (spec[0]=='u'?S_ISUID:(spec[0]=='g'?S_ISGID:S_ISVTX)) ;
+				mode_t clearbits = (mode_t(7)<<shift) | (spec[0]=='u'?mode_t(S_ISUID):(spec[0]=='g'?mode_t(S_ISGID):mode_t(S_ISVTX))) ;
 				mode &= ~clearbits ;
 				mode |= (part<<shift) ;
 				mode |= special ;
@@ -281,7 +295,7 @@ std::pair<bool,mode_t> G::FileImp::newmode( mode_t mode , const std::string & sp
 			ok = false ;
 		}
 	}
-	return std::make_pair( ok , mode ) ;
+	return { ok , mode } ;
 }
 
 void G::File::chgrp( const Path & path , const std::string & group )
@@ -304,7 +318,7 @@ void G::File::link( const Path & target , const Path & new_link )
 	if( exists(new_link) )
 		remove( new_link , std::nothrow ) ;
 
-	int error = link( target.cstr() , new_link.cstr() ) ;
+	int error = linkImp( target.cstr() , new_link.cstr() ) ;
 
 	if( error != 0 )
 	{
@@ -322,10 +336,10 @@ bool G::File::link( const Path & target , const Path & new_link , std::nothrow_t
 	if( exists(new_link) )
 		remove( new_link , std::nothrow ) ;
 
-	return 0 == link( target.cstr() , new_link.cstr() ) ;
+	return 0 == linkImp( target.cstr() , new_link.cstr() ) ;
 }
 
-int G::File::link( const char * target , const char * new_link )
+int G::File::linkImp( const char * target , const char * new_link )
 {
 	int rc = ::symlink( target , new_link ) ;
 	int error = Process::errno_() ;
diff --git a/src/glib/gfile_win32.cpp b/src/glib/gfile_win32.cpp
index 4c4f3f6..6938703 100644
--- a/src/glib/gfile_win32.cpp
+++ b/src/glib/gfile_win32.cpp
@@ -39,7 +39,7 @@ namespace G
 		template <typename T>
 		void open( T & io , const char * path , std::ios_base::openmode mode )
 		{
-			#if GCONFIG_HAVE_EXTENDEND_OPEN
+			#if GCONFIG_HAVE_EXTENDED_OPEN
 				io.open( path , mode , _SH_DENYNO ) ; // _fsopen()
 			#else
 				io.open( path , mode ) ;
@@ -48,6 +48,7 @@ namespace G
 		int open( const char * path , int flags , int pmode ) noexcept
 		{
 			#if GCONFIG_HAVE_SOPEN_S
+				_set_errno( 0 ) ; // mingw bug
 				int fd = -1 ;
 				errno_t rc = _sopen_s( &fd , path , flags , _SH_DENYNO , pmode ) ;
 				return rc == 0 ? fd : -1 ;
@@ -106,6 +107,15 @@ int G::File::open( const char * path , InOutAppend mode ) noexcept
 		return FileImp::open( path , _O_WRONLY|_O_CREAT|_O_APPEND|_O_BINARY , pmode ) ;
 }
 
+bool G::File::probe( const char * path ) noexcept
+{
+	int pmode = _S_IREAD | _S_IWRITE ;
+	int fd = FileImp::open( path , _O_WRONLY|_O_CREAT|_O_EXCL|O_TEMPORARY|_O_BINARY , pmode ) ;
+	if( fd >= 0 )
+		_close( fd ) ; // also deletes
+	return fd >= 0 ;
+}
+
 void G::File::create( const Path & path )
 {
 	int fd = FileImp::open( path.cstr() , _O_RDONLY|_O_CREAT , _S_IREAD|_S_IWRITE ) ;
diff --git a/src/glib/gformat.cpp b/src/glib/gformat.cpp
index 89d450b..14a84c9 100644
--- a/src/glib/gformat.cpp
+++ b/src/glib/gformat.cpp
@@ -58,7 +58,7 @@ std::string G::format::str() const
 {
 	std::string s = m_fmt ;
 	const std::size_t npos = std::string::npos ;
-	for( std::size_t p = s.find('%') ; p != npos ; p = s.find('%',p) )
+	for( std::size_t p = s.find('%') ; p != npos && (p+2U) < s.size() ; )
 	{
 		std::size_t q = s.find( '%' , p+1 ) ;
 		if( q != npos && q == (p+2U) && isdigit(s.at(p+1U)) ) // kiss 1..9 only
@@ -78,6 +78,7 @@ std::string G::format::str() const
 		{
 			p++ ;
 		}
+		p = p < s.size() ? s.find('%',p) : npos ;
 	}
 	return s ;
 }
diff --git a/src/glib/glogoutput_win32.cpp b/src/glib/glogoutput_win32.cpp
index 95ad891..90b03d6 100644
--- a/src/glib/glogoutput_win32.cpp
+++ b/src/glib/glogoutput_win32.cpp
@@ -74,7 +74,10 @@ void G::LogOutput::osoutput( int fd , G::Log::Severity severity , char * message
 {
 	// event log
 	//
-	if( m_config.m_use_syslog && severity != Log::Severity::s_Debug && m_handle != HNULL )
+	if( m_config.m_use_syslog &&
+		severity != Log::Severity::s_Debug &&
+		severity != Log::Severity::s_InfoVerbose && // (new)
+		m_handle != HNULL )
 	{
 		DWORD id = 0x400003E9L ; // 1001
 		WORD type = EVENTLOG_INFORMATION_TYPE ;
diff --git a/src/glib/gmsg.h b/src/glib/gmsg.h
index 9be40b3..9158d06 100644
--- a/src/glib/gmsg.h
+++ b/src/glib/gmsg.h
@@ -37,22 +37,18 @@ namespace G
 class G::Msg
 {
 public:
-	static ssize_t send( SOCKET , const void * , std::size_t , int ,
-		int fd_to_send = -1 ) noexcept ;
+	static ssize_t send( SOCKET , const void * , std::size_t , int flags ) noexcept ;
 			///< A send() replacement using sendmsg().
 
-	static ssize_t sendto( SOCKET , const void * , std::size_t , int , const sockaddr * , socklen_t ,
-		int fd_to_send = -1 ) noexcept ;
+	static ssize_t sendto( SOCKET , const void * , std::size_t , int flags ,
+		const sockaddr * , socklen_t ) noexcept ;
 			///< A sendto() replacement using sendmsg().
 
-	static ssize_t recv( SOCKET , void * , std::size_t , int ) ;
+	static ssize_t recv( SOCKET , void * , std::size_t , int flags ) ;
 		///< A recv() wrapper.
 
-	static ssize_t recv( SOCKET , void * , std::size_t , int , int * fd_received_p ) ;
-		///< A recv() replacement using recvmsg().
-
-	static ssize_t recvfrom( SOCKET , void * , std::size_t , int , sockaddr * , socklen_t * ,
-		int * fd_received_p = nullptr ) ;
+	static ssize_t recvfrom( SOCKET , void * , std::size_t , int flags ,
+		sockaddr * , socklen_t * ) ;
 			///< A recvfrom() replacement using recvmsg().
 
 	static bool fatal( int error ) noexcept ;
diff --git a/src/glib/gmsg_unix.cpp b/src/glib/gmsg_unix.cpp
index d1f5c54..3d2b008 100644
--- a/src/glib/gmsg_unix.cpp
+++ b/src/glib/gmsg_unix.cpp
@@ -31,52 +31,15 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 
-ssize_t G::Msg::send( int fd , const void * buffer , std::size_t size , int flags ,
-	int fd_to_send ) noexcept
+ssize_t G::Msg::send( int fd , const void * buffer , std::size_t size , int flags ) noexcept
 {
-	return sendto( fd , buffer , size , flags , nullptr , 0 , fd_to_send ) ;
+	return ::sendto( fd , buffer , size , flags | MSG_NOSIGNAL , nullptr , 0U ) ;
 }
 
 ssize_t G::Msg::sendto( int fd , const void * buffer , std::size_t size , int flags ,
-	const sockaddr * address_p , socklen_t address_n , int fd_to_send ) noexcept
+	const sockaddr * address_p , socklen_t address_n ) noexcept
 {
-	struct ::msghdr msg {} ;
-
-	msg.msg_name = const_cast<sockaddr*>(address_p) ;
-	msg.msg_namelen = address_n ;
-
-	struct ::iovec io {} ;
-	io.iov_base = const_cast<void*>(buffer) ;
-	io.iov_len = size ;
-	msg.msg_iov = &io ;
-	msg.msg_iovlen = 1 ;
-
-	constexpr std::size_t space = CMSG_SPACE( sizeof(int) ) ;
-	static_assert( space != 0U , "" ) ;
-	std::array<char,space> control_buffer {} ;
-	if( fd_to_send == -1 )
-	{
-		msg.msg_control = nullptr ;
-		msg.msg_controllen = 0U ;
-	}
-	else
-	{
-		std::memset( &control_buffer[0] , 0 , control_buffer.size() ) ;
-		msg.msg_control = &control_buffer[0] ;
-		msg.msg_controllen = control_buffer.size() ;
-
-		struct ::cmsghdr * cmsg = CMSG_FIRSTHDR( &msg ) ;
-		G_ASSERT( cmsg != nullptr ) ;
-		if( cmsg != nullptr )
-		{
-			cmsg->cmsg_len = CMSG_LEN( sizeof(int) ) ;
-			cmsg->cmsg_level = SOL_SOCKET ;
-			cmsg->cmsg_type = SCM_RIGHTS ;
-			std::memcpy( CMSG_DATA(cmsg) , &fd_to_send , sizeof(int) ) ;
-		}
-	}
-
-	return ::sendmsg( fd , &msg , flags | MSG_NOSIGNAL ) ;
+	return ::sendto( fd , buffer , size , flags | MSG_NOSIGNAL , const_cast<sockaddr*>(address_p) , address_n ) ;
 }
 
 ssize_t G::Msg::recv( int fd , void * buffer , std::size_t size , int flags )
@@ -84,46 +47,10 @@ ssize_t G::Msg::recv( int fd , void * buffer , std::size_t size , int flags )
 	return ::recv( fd , buffer , size , flags ) ;
 }
 
-ssize_t G::Msg::recv( int fd , void * buffer , std::size_t size , int flags ,
-	int * fd_received_p )
-{
-	return recvfrom( fd , buffer , size , flags , nullptr , nullptr , fd_received_p ) ;
-}
-
 ssize_t G::Msg::recvfrom( int fd , void * buffer , std::size_t size , int flags ,
-	sockaddr * address_p , socklen_t * address_np , int * fd_received_p )
+	sockaddr * address_p , socklen_t * address_np )
 {
-	struct ::msghdr msg {} ;
-
-	msg.msg_name = address_p ;
-	msg.msg_namelen = address_np == nullptr ? socklen_t(0) : *address_np ;
-
-	struct ::iovec io {} ;
-	io.iov_base = buffer ;
-	io.iov_len = size ;
-	msg.msg_iov = &io ;
-	msg.msg_iovlen = 1 ;
-
-	std::array<char,CMSG_SPACE(sizeof(int))> control_buffer ; // NOLINT cppcoreguidelines-pro-type-member-init
-	msg.msg_control = &control_buffer[0] ;
-	msg.msg_controllen = control_buffer.size() ;
-
-	ssize_t rc = ::recvmsg( fd , &msg , flags ) ;
-	int e = Process::errno_() ;
-	if( rc >= 0 && msg.msg_controllen > 0U && fd_received_p != nullptr )
-	{
-		struct cmsghdr * cmsg = CMSG_FIRSTHDR( &msg ) ;
-		if( cmsg != nullptr && cmsg->cmsg_type == SCM_RIGHTS )
-		{
-			std::memcpy( fd_received_p , CMSG_DATA(cmsg) , sizeof(int) ) ;
-		}
-	}
-	if( rc >= 0 && address_np != nullptr )
-	{
-		*address_np = msg.msg_namelen ;
-	}
-	Process::errno_( SignalSafe() , e ) ;
-	return rc ; // with errno
+	return ::recvfrom( fd , buffer , size , flags , address_p , address_np ) ;
 }
 
 bool G::Msg::fatal( int error ) noexcept
diff --git a/src/glib/gmsg_win32.cpp b/src/glib/gmsg_win32.cpp
index e61f8a5..fbf7964 100644
--- a/src/glib/gmsg_win32.cpp
+++ b/src/glib/gmsg_win32.cpp
@@ -23,13 +23,13 @@
 #include "gprocess.h"
 #include "gstr.h"
 
-ssize_t G::Msg::send( SOCKET fd , const void * buffer , std::size_t size , int flags , int ) noexcept
+ssize_t G::Msg::send( SOCKET fd , const void * buffer , std::size_t size , int flags ) noexcept
 {
 	return ::send( fd , reinterpret_cast<const char*>(buffer) , static_cast<int>(size) , flags ) ;
 }
 
 ssize_t G::Msg::sendto( SOCKET fd , const void * buffer , std::size_t size , int flags ,
-	const sockaddr * address_p , socklen_t address_n , int ) noexcept
+	const sockaddr * address_p , socklen_t address_n ) noexcept
 {
 	return ::sendto( fd , reinterpret_cast<const char*>(buffer) , static_cast<int>(size) ,
 		flags , address_p , address_n ) ;
@@ -40,13 +40,8 @@ ssize_t G::Msg::recv( SOCKET fd , void * buffer , std::size_t size , int flags )
 	return ::recv( fd , reinterpret_cast<char*>(buffer) , static_cast<int>(size) , flags ) ;
 }
 
-ssize_t G::Msg::recv( SOCKET fd , void * buffer , std::size_t size , int flags , int * )
-{
-	return ::recv( fd , reinterpret_cast<char*>(buffer) , static_cast<int>(size) , flags ) ;
-}
-
 ssize_t G::Msg::recvfrom( SOCKET fd , void * buffer , std::size_t size , int flags ,
-	sockaddr * address_p , socklen_t * address_np , int * fd_received_p )
+	sockaddr * address_p , socklen_t * address_np )
 {
 	return ::recvfrom( fd , reinterpret_cast<char*>(buffer) , static_cast<int>(size) ,
 		flags , address_p , address_np ) ;
diff --git a/src/glib/gpidfile.cpp b/src/glib/gpidfile.cpp
index c193627..f997bf3 100644
--- a/src/glib/gpidfile.cpp
+++ b/src/glib/gpidfile.cpp
@@ -79,7 +79,7 @@ void G::PidFile::create( const Path & pid_file )
 		if( buffer[0] == '\0' && pid_file.size() < buffer.size() )
 			G::Str::strncpy_s( &buffer[0] , buffer.size() , pid_file.cstr() , pid_file.size() ) ;
 		else
-			cleanup_arg = new_string_ignore_leak(pid_file.str())->c_str() ;
+			cleanup_arg = Cleanup::strdup( pid_file.str() ) ;
 
 		Cleanup::add( cleanup , cleanup_arg ) ;
 	}
@@ -153,8 +153,3 @@ bool G::PidFile::valid() const
 	return !m_path.empty() ;
 }
 
-std::string * G::PidFile::new_string_ignore_leak( const std::string & s )
-{
-	return new std::string( s ) ; // ignore leak
-}
-
diff --git a/src/glib/gpidfile.h b/src/glib/gpidfile.h
index 0eb48f6..590ad1d 100644
--- a/src/glib/gpidfile.h
+++ b/src/glib/gpidfile.h
@@ -118,7 +118,6 @@ public:
 
 private:
 	static void create( const Path & pid_file ) ;
-	static std::string * new_string_ignore_leak( const std::string & ) ;
 	static Process::Id read( SignalSafe , const char * path ) noexcept ;
 	bool valid() const ;
 
diff --git a/src/glib/gprocess.h b/src/glib/gprocess.h
index 1ac46c5..f7c07c9 100644
--- a/src/glib/gprocess.h
+++ b/src/glib/gprocess.h
@@ -157,7 +157,7 @@ public:
 	class Umask /// Used to temporarily modify the process umask.
 	{
 	public:
-		enum class Mode { Readable , Tighter , Tightest , GroupOpen } ;
+		enum class Mode { Readable , Tighter , Tightest , GroupOpen , Open } ;
 		explicit Umask( Mode ) ;
 		~Umask() ;
 		static void set( Mode ) ;
diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp
index c03955c..56b04f0 100644
--- a/src/glib/gprocess_unix.cpp
+++ b/src/glib/gprocess_unix.cpp
@@ -302,6 +302,7 @@ mode_t G::ProcessImp::umaskValue( Process::Umask::Mode mode )
 	if( mode == Process::Umask::Mode::Tighter ) m = 0117 ;  // -rw-rw----
 	if( mode == Process::Umask::Mode::Readable ) m = 0133 ; // -rw-r--r--
 	if( mode == Process::Umask::Mode::GroupOpen ) m = 0113 ;// -rw-rw-r--
+	if( mode == Process::Umask::Mode::Open ) m = 0111 ;     // -rw-rw-rw-
 	return m ;
 }
 
diff --git a/src/glib/gstr.cpp b/src/glib/gstr.cpp
index 74121fd..264982f 100644
--- a/src/glib/gstr.cpp
+++ b/src/glib/gstr.cpp
@@ -61,7 +61,7 @@ namespace G
 		short toShort( const std::string & s , bool & overflow , bool & invalid ) ;
 		long toLong( const std::string & s , bool & overflow , bool & invalid ) ;
 		int toInt( const std::string & s , bool & overflow , bool & invalid ) ;
-		void strncpy( char * , const char * , size_t ) noexcept ;
+		void strncpy( char * , const char * , std::size_t ) noexcept ;
 		void escape( std::string & s , char c_escape , const char * specials_in , const char * specials_out ,
 			bool with_nul ) ;
 		void readLineFrom( std::istream & stream , const std::string & eol , std::string & line ) ;
@@ -652,7 +652,7 @@ unsigned long G::StrImp::toULongHex( const std::string & s , bool limited )
 {
 	unsigned long n = 0U ;
 	if( s.empty() ) return 0U ;
-	size_t i0 = s.find_first_not_of('0') ;
+	std::size_t i0 = s.find_first_not_of('0') ;
 	if( i0 == std::string::npos ) i0 = 0U ;
 	if( (s.size()-i0) > (sizeof(unsigned long)*2U) )
 	{
@@ -1514,7 +1514,7 @@ G::StringArray::iterator G::Str::removeMatch( StringArray::iterator begin , Stri
 		std::bind(imp::inList,match_list.begin(),match_list.end(),_1,ignore_case) ) ;
 }
 
-void G::StrImp::strncpy( char * dst , const char * src , size_t n ) noexcept
+void G::StrImp::strncpy( char * dst , const char * src , std::size_t n ) noexcept
 {
 	// (because 'strncpy considered dangerous' analytics)
 	for( ; n ; n-- , dst++ , src++ )
@@ -1525,7 +1525,7 @@ void G::StrImp::strncpy( char * dst , const char * src , size_t n ) noexcept
 	}
 }
 
-errno_t G::Str::strncpy_s( char * dst , size_t n_dst , const char * src , size_t count ) noexcept
+errno_t G::Str::strncpy_s( char * dst , std::size_t n_dst , const char * src , std::size_t count ) noexcept
 {
 	namespace imp = G::StrImp ;
 	if( dst == nullptr || n_dst == 0U )
diff --git a/src/glib/gstr.h b/src/glib/gstr.h
index 4ea1ccf..04dc7b7 100644
--- a/src/glib/gstr.h
+++ b/src/glib/gstr.h
@@ -542,10 +542,10 @@ public:
 			///< in the match-list (blocklist). (Removes nothing if the match-list is
 			///< empty.) Returns an iterator for erase().
 
-	static constexpr size_t truncate = (~(static_cast<std::size_t>(0U))) ;
+	static constexpr std::size_t truncate = (~(static_cast<std::size_t>(0U))) ;
 		///< A special value for the G::Str::strncpy_s() 'count' parameter.
 
-	static errno_t strncpy_s( char * dst , size_t n_dst , const char * src , size_t count ) noexcept ;
+	static errno_t strncpy_s( char * dst , std::size_t n_dst , const char * src , std::size_t count ) noexcept ;
 		///< Does the same as windows strncpy_s(). Copies count characters
 		///< from src to dst and adds a terminator character, but fails
 		///< if dst is too small. If the count is 'truncate' then as
diff --git a/src/gnet/Makefile.am b/src/gnet/Makefile.am
index b046748..57406f4 100644
--- a/src/gnet/Makefile.am
+++ b/src/gnet/Makefile.am
@@ -30,6 +30,7 @@ if GCONFIG_WINDOWS
 AM_CPPFLAGS = -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gssl -I$(top_srcdir)/src/win32
 
 EXTRA_DIST_COMMON=\
+	gaddresslocal_unix.cpp \
 	gdescriptor_unix.cpp \
 	geventloop_select.cpp \
 	geventloop_epoll.cpp \
@@ -64,6 +65,8 @@ endif
 
 libgnet_a_SOURCES = \
 	$(IP46_SOURCES) \
+	gaddresslocal_none.cpp \
+	gaddresslocal.h \
 	gaddress4.cpp \
 	gaddress4.h \
 	gaddress6.cpp \
@@ -150,6 +153,24 @@ EXTRA_DIST_COMMON=\
 	gfutureevent_win32.cpp \
 	gsocket_win32.cpp
 
+if GCONFIG_UDS
+
+UDS_SOURCES = \
+	gaddresslocal_unix.cpp
+
+EXTRA_DIST_UDS = \
+	gaddresslocal_none.cpp
+
+else
+
+UDS_SOURCES = \
+	gaddresslocal_none.cpp
+
+EXTRA_DIST_UDS = \
+	gaddresslocal_unix.cpp
+
+endif
+
 if GCONFIG_INTERFACE_NAMES
 
 EXTRA_DIST_INTERFACES = \
@@ -192,13 +213,16 @@ endif
 
 EXTRA_DIST = \
 	$(EXTRA_DIST_COMMON) \
+	$(EXTRA_DIST_UDS) \
 	$(EXTRA_DIST_INTERFACES) \
 	$(EXTRA_DIST_EVENTLOOP) \
 	$(EXTRA_DIST_IP46)
 
 libgnet_a_SOURCES = \
 	$(IP46_SOURCES) \
+	$(UDS_SOURCES) \
 	gaddress.h \
+	gaddresslocal.h \
 	gaddress4.h \
 	gaddress4.cpp \
 	gaddress6.h \
diff --git a/src/gnet/Makefile.in b/src/gnet/Makefile.in
index de3497e..4c37154 100644
--- a/src/gnet/Makefile.in
+++ b/src/gnet/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -111,9 +111,10 @@ am__v_AR_1 =
 libgnet_a_AR = $(AR) $(ARFLAGS)
 libgnet_a_LIBADD =
 am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
-	gaddress.h gaddress4.h gaddress4.cpp gaddress6.h gaddress6.cpp \
-	gclient.cpp gclient.h gclientptr.cpp gclientptr.h \
-	gconnection.cpp gconnection.h gdescriptor.h \
+	gaddresslocal_none.cpp gaddresslocal_unix.cpp gaddress.h \
+	gaddresslocal.h gaddress4.h gaddress4.cpp gaddress6.h \
+	gaddress6.cpp gclient.cpp gclient.h gclientptr.cpp \
+	gclientptr.h gconnection.cpp gconnection.h gdescriptor.h \
 	gdescriptor_unix.cpp gdnsblock.cpp gdnsblock.h gdnsmessage.cpp \
 	gdnsmessage.h gevent.h geventhandler.cpp geventhandler.h \
 	geventhandlerlist.cpp geventhandlerlist.h \
@@ -136,17 +137,20 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 	gfutureevent_win32.cpp gsocket_win32.cpp
 @GCONFIG_IPV6_FALSE@am__objects_1 = gaddress_ipv4.$(OBJEXT)
 @GCONFIG_IPV6_TRUE@am__objects_1 = gaddress_ipv6.$(OBJEXT)
-@GCONFIG_EPOLL_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = geventloop_select.$(OBJEXT)
-@GCONFIG_EPOLL_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = geventloop_epoll.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = ginterfaces_none.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@am__objects_3 = ginterfaces_none.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = ginterfaces_unix.$(OBJEXT) \
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = gaddresslocal_none.$(OBJEXT)
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = gaddresslocal_unix.$(OBJEXT)
+@GCONFIG_EPOLL_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = geventloop_select.$(OBJEXT)
+@GCONFIG_EPOLL_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = geventloop_epoll.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_4 = ginterfaces_none.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@am__objects_4 = ginterfaces_none.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_4 = ginterfaces_unix.$(OBJEXT) \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@	ginterfaces_common.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@am__objects_3 = ginterfaces_common.$(OBJEXT) \
+@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@am__objects_4 = ginterfaces_common.$(OBJEXT) \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_win32.$(OBJEXT)
 @GCONFIG_WINDOWS_FALSE@am_libgnet_a_OBJECTS = $(am__objects_1) \
-@GCONFIG_WINDOWS_FALSE@	gaddress4.$(OBJEXT) gaddress6.$(OBJEXT) \
-@GCONFIG_WINDOWS_FALSE@	gclient.$(OBJEXT) gclientptr.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	$(am__objects_2) gaddress4.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	gaddress6.$(OBJEXT) gclient.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	gclientptr.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gconnection.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gdescriptor_unix.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gdnsblock.$(OBJEXT) \
@@ -154,12 +158,12 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_FALSE@	geventhandler.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	geventhandlerlist.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	geventloggingcontext.$(OBJEXT) \
-@GCONFIG_WINDOWS_FALSE@	geventloop.$(OBJEXT) $(am__objects_2) \
+@GCONFIG_WINDOWS_FALSE@	geventloop.$(OBJEXT) $(am__objects_3) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionhandler.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionsink.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionsource.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gfutureevent_unix.$(OBJEXT) \
-@GCONFIG_WINDOWS_FALSE@	$(am__objects_3) glinebuffer.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	$(am__objects_4) glinebuffer.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	glinestore.$(OBJEXT) glocal.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	glocation.$(OBJEXT) gmonitor.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gmultiserver.$(OBJEXT) \
@@ -172,6 +176,7 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_FALSE@	gsocks.$(OBJEXT) gtask.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gtimer.$(OBJEXT) gtimerlist.$(OBJEXT)
 @GCONFIG_WINDOWS_TRUE@am_libgnet_a_OBJECTS = $(am__objects_1) \
+@GCONFIG_WINDOWS_TRUE@	gaddresslocal_none.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.$(OBJEXT) gaddress6.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gclient.$(OBJEXT) gclientptr.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gconnection.$(OBJEXT) \
@@ -188,7 +193,7 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_TRUE@	gexceptionsink.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gexceptionsource.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gfutureevent_win32.$(OBJEXT) \
-@GCONFIG_WINDOWS_TRUE@	$(am__objects_3) glinebuffer.$(OBJEXT) \
+@GCONFIG_WINDOWS_TRUE@	$(am__objects_4) glinebuffer.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	glinestore.$(OBJEXT) glocal.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	glocation.$(OBJEXT) gmonitor.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gmultiserver.$(OBJEXT) \
@@ -213,9 +218,39 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gaddress4.Po \
+	./$(DEPDIR)/gaddress6.Po ./$(DEPDIR)/gaddress_ipv4.Po \
+	./$(DEPDIR)/gaddress_ipv6.Po ./$(DEPDIR)/gaddresslocal_none.Po \
+	./$(DEPDIR)/gaddresslocal_unix.Po ./$(DEPDIR)/gclient.Po \
+	./$(DEPDIR)/gclientptr.Po ./$(DEPDIR)/gconnection.Po \
+	./$(DEPDIR)/gdescriptor_unix.Po \
+	./$(DEPDIR)/gdescriptor_win32.Po ./$(DEPDIR)/gdnsblock.Po \
+	./$(DEPDIR)/gdnsmessage.Po ./$(DEPDIR)/geventhandler.Po \
+	./$(DEPDIR)/geventhandlerlist.Po \
+	./$(DEPDIR)/geventloggingcontext.Po ./$(DEPDIR)/geventloop.Po \
+	./$(DEPDIR)/geventloop_epoll.Po \
+	./$(DEPDIR)/geventloop_select.Po \
+	./$(DEPDIR)/geventloop_win32.Po \
+	./$(DEPDIR)/gexceptionhandler.Po ./$(DEPDIR)/gexceptionsink.Po \
+	./$(DEPDIR)/gexceptionsource.Po \
+	./$(DEPDIR)/gfutureevent_unix.Po \
+	./$(DEPDIR)/gfutureevent_win32.Po \
+	./$(DEPDIR)/ginterfaces_common.Po \
+	./$(DEPDIR)/ginterfaces_none.Po \
+	./$(DEPDIR)/ginterfaces_unix.Po \
+	./$(DEPDIR)/ginterfaces_win32.Po ./$(DEPDIR)/glinebuffer.Po \
+	./$(DEPDIR)/glinestore.Po ./$(DEPDIR)/glocal.Po \
+	./$(DEPDIR)/glocation.Po ./$(DEPDIR)/gmonitor.Po \
+	./$(DEPDIR)/gmultiserver.Po ./$(DEPDIR)/gnetdone.Po \
+	./$(DEPDIR)/gresolver.Po ./$(DEPDIR)/gresolverfuture.Po \
+	./$(DEPDIR)/gserver.Po ./$(DEPDIR)/gserverpeer.Po \
+	./$(DEPDIR)/gsocket.Po ./$(DEPDIR)/gsocket_unix.Po \
+	./$(DEPDIR)/gsocket_win32.Po ./$(DEPDIR)/gsocketprotocol.Po \
+	./$(DEPDIR)/gsocks.Po ./$(DEPDIR)/gtask.Po \
+	./$(DEPDIR)/gtimer.Po ./$(DEPDIR)/gtimerlist.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -332,6 +367,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -368,6 +404,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -408,6 +445,7 @@ noinst_LIBRARIES = libgnet.a
 @GCONFIG_WINDOWS_FALSE@	gsocket_win32.cpp
 
 @GCONFIG_WINDOWS_TRUE@EXTRA_DIST_COMMON = \
+@GCONFIG_WINDOWS_TRUE@	gaddresslocal_unix.cpp \
 @GCONFIG_WINDOWS_TRUE@	gdescriptor_unix.cpp \
 @GCONFIG_WINDOWS_TRUE@	geventloop_select.cpp \
 @GCONFIG_WINDOWS_TRUE@	geventloop_epoll.cpp \
@@ -429,6 +467,7 @@ noinst_LIBRARIES = libgnet.a
 
 @GCONFIG_WINDOWS_FALSE@EXTRA_DIST = \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_COMMON) \
+@GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_UDS) \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_INTERFACES) \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_EVENTLOOP) \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_IP46)
@@ -449,7 +488,9 @@ noinst_LIBRARIES = libgnet.a
 
 @GCONFIG_WINDOWS_FALSE@libgnet_a_SOURCES = \
 @GCONFIG_WINDOWS_FALSE@	$(IP46_SOURCES) \
+@GCONFIG_WINDOWS_FALSE@	$(UDS_SOURCES) \
 @GCONFIG_WINDOWS_FALSE@	gaddress.h \
+@GCONFIG_WINDOWS_FALSE@	gaddresslocal.h \
 @GCONFIG_WINDOWS_FALSE@	gaddress4.h \
 @GCONFIG_WINDOWS_FALSE@	gaddress4.cpp \
 @GCONFIG_WINDOWS_FALSE@	gaddress6.h \
@@ -525,6 +566,8 @@ noinst_LIBRARIES = libgnet.a
 
 @GCONFIG_WINDOWS_TRUE@libgnet_a_SOURCES = \
 @GCONFIG_WINDOWS_TRUE@	$(IP46_SOURCES) \
+@GCONFIG_WINDOWS_TRUE@	gaddresslocal_none.cpp \
+@GCONFIG_WINDOWS_TRUE@	gaddresslocal.h \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.cpp \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.h \
 @GCONFIG_WINDOWS_TRUE@	gaddress6.cpp \
@@ -601,6 +644,18 @@ noinst_LIBRARIES = libgnet.a
 @GCONFIG_WINDOWS_TRUE@	gtimerlist.cpp \
 @GCONFIG_WINDOWS_TRUE@	gtimerlist.h
 
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@UDS_SOURCES = \
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@	gaddresslocal_none.cpp
+
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@UDS_SOURCES = \
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@	gaddresslocal_unix.cpp
+
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@EXTRA_DIST_UDS = \
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@	gaddresslocal_unix.cpp
+
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@EXTRA_DIST_UDS = \
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@	gaddresslocal_none.cpp
+
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@EXTRA_DIST_INTERFACES = \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@	ginterfaces_win32.cpp \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@	ginterfaces_unix.cpp \
@@ -643,8 +698,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -670,52 +725,60 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv6.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclientptr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconnection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdescriptor_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdescriptor_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdnsblock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdnsmessage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventhandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventhandlerlist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloggingcontext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_epoll.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_select.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionhandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionsink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionsource.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfutureevent_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfutureevent_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_none.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glinebuffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glinestore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmonitor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmultiserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetdone.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolverfuture.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserverpeer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocketprotocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtask.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtimerlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress4.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv4.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv6.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddresslocal_none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddresslocal_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclientptr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconnection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdescriptor_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdescriptor_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdnsblock.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdnsmessage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventhandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventhandlerlist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloggingcontext.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_epoll.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_select.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geventloop_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionhandler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionsink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexceptionsource.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfutureevent_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfutureevent_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_common.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginterfaces_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glinebuffer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glinestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glocation.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmonitor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmultiserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetdone.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gresolverfuture.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gserverpeer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocket_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocketprotocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsocks.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtask.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtimer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtimerlist.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -783,7 +846,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -852,7 +918,54 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gaddress4.Po
+	-rm -f ./$(DEPDIR)/gaddress6.Po
+	-rm -f ./$(DEPDIR)/gaddress_ipv4.Po
+	-rm -f ./$(DEPDIR)/gaddress_ipv6.Po
+	-rm -f ./$(DEPDIR)/gaddresslocal_none.Po
+	-rm -f ./$(DEPDIR)/gaddresslocal_unix.Po
+	-rm -f ./$(DEPDIR)/gclient.Po
+	-rm -f ./$(DEPDIR)/gclientptr.Po
+	-rm -f ./$(DEPDIR)/gconnection.Po
+	-rm -f ./$(DEPDIR)/gdescriptor_unix.Po
+	-rm -f ./$(DEPDIR)/gdescriptor_win32.Po
+	-rm -f ./$(DEPDIR)/gdnsblock.Po
+	-rm -f ./$(DEPDIR)/gdnsmessage.Po
+	-rm -f ./$(DEPDIR)/geventhandler.Po
+	-rm -f ./$(DEPDIR)/geventhandlerlist.Po
+	-rm -f ./$(DEPDIR)/geventloggingcontext.Po
+	-rm -f ./$(DEPDIR)/geventloop.Po
+	-rm -f ./$(DEPDIR)/geventloop_epoll.Po
+	-rm -f ./$(DEPDIR)/geventloop_select.Po
+	-rm -f ./$(DEPDIR)/geventloop_win32.Po
+	-rm -f ./$(DEPDIR)/gexceptionhandler.Po
+	-rm -f ./$(DEPDIR)/gexceptionsink.Po
+	-rm -f ./$(DEPDIR)/gexceptionsource.Po
+	-rm -f ./$(DEPDIR)/gfutureevent_unix.Po
+	-rm -f ./$(DEPDIR)/gfutureevent_win32.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_common.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_none.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_unix.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_win32.Po
+	-rm -f ./$(DEPDIR)/glinebuffer.Po
+	-rm -f ./$(DEPDIR)/glinestore.Po
+	-rm -f ./$(DEPDIR)/glocal.Po
+	-rm -f ./$(DEPDIR)/glocation.Po
+	-rm -f ./$(DEPDIR)/gmonitor.Po
+	-rm -f ./$(DEPDIR)/gmultiserver.Po
+	-rm -f ./$(DEPDIR)/gnetdone.Po
+	-rm -f ./$(DEPDIR)/gresolver.Po
+	-rm -f ./$(DEPDIR)/gresolverfuture.Po
+	-rm -f ./$(DEPDIR)/gserver.Po
+	-rm -f ./$(DEPDIR)/gserverpeer.Po
+	-rm -f ./$(DEPDIR)/gsocket.Po
+	-rm -f ./$(DEPDIR)/gsocket_unix.Po
+	-rm -f ./$(DEPDIR)/gsocket_win32.Po
+	-rm -f ./$(DEPDIR)/gsocketprotocol.Po
+	-rm -f ./$(DEPDIR)/gsocks.Po
+	-rm -f ./$(DEPDIR)/gtask.Po
+	-rm -f ./$(DEPDIR)/gtimer.Po
+	-rm -f ./$(DEPDIR)/gtimerlist.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -898,7 +1011,54 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gaddress4.Po
+	-rm -f ./$(DEPDIR)/gaddress6.Po
+	-rm -f ./$(DEPDIR)/gaddress_ipv4.Po
+	-rm -f ./$(DEPDIR)/gaddress_ipv6.Po
+	-rm -f ./$(DEPDIR)/gaddresslocal_none.Po
+	-rm -f ./$(DEPDIR)/gaddresslocal_unix.Po
+	-rm -f ./$(DEPDIR)/gclient.Po
+	-rm -f ./$(DEPDIR)/gclientptr.Po
+	-rm -f ./$(DEPDIR)/gconnection.Po
+	-rm -f ./$(DEPDIR)/gdescriptor_unix.Po
+	-rm -f ./$(DEPDIR)/gdescriptor_win32.Po
+	-rm -f ./$(DEPDIR)/gdnsblock.Po
+	-rm -f ./$(DEPDIR)/gdnsmessage.Po
+	-rm -f ./$(DEPDIR)/geventhandler.Po
+	-rm -f ./$(DEPDIR)/geventhandlerlist.Po
+	-rm -f ./$(DEPDIR)/geventloggingcontext.Po
+	-rm -f ./$(DEPDIR)/geventloop.Po
+	-rm -f ./$(DEPDIR)/geventloop_epoll.Po
+	-rm -f ./$(DEPDIR)/geventloop_select.Po
+	-rm -f ./$(DEPDIR)/geventloop_win32.Po
+	-rm -f ./$(DEPDIR)/gexceptionhandler.Po
+	-rm -f ./$(DEPDIR)/gexceptionsink.Po
+	-rm -f ./$(DEPDIR)/gexceptionsource.Po
+	-rm -f ./$(DEPDIR)/gfutureevent_unix.Po
+	-rm -f ./$(DEPDIR)/gfutureevent_win32.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_common.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_none.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_unix.Po
+	-rm -f ./$(DEPDIR)/ginterfaces_win32.Po
+	-rm -f ./$(DEPDIR)/glinebuffer.Po
+	-rm -f ./$(DEPDIR)/glinestore.Po
+	-rm -f ./$(DEPDIR)/glocal.Po
+	-rm -f ./$(DEPDIR)/glocation.Po
+	-rm -f ./$(DEPDIR)/gmonitor.Po
+	-rm -f ./$(DEPDIR)/gmultiserver.Po
+	-rm -f ./$(DEPDIR)/gnetdone.Po
+	-rm -f ./$(DEPDIR)/gresolver.Po
+	-rm -f ./$(DEPDIR)/gresolverfuture.Po
+	-rm -f ./$(DEPDIR)/gserver.Po
+	-rm -f ./$(DEPDIR)/gserverpeer.Po
+	-rm -f ./$(DEPDIR)/gsocket.Po
+	-rm -f ./$(DEPDIR)/gsocket_unix.Po
+	-rm -f ./$(DEPDIR)/gsocket_win32.Po
+	-rm -f ./$(DEPDIR)/gsocketprotocol.Po
+	-rm -f ./$(DEPDIR)/gsocks.Po
+	-rm -f ./$(DEPDIR)/gtask.Po
+	-rm -f ./$(DEPDIR)/gtimer.Po
+	-rm -f ./$(DEPDIR)/gtimerlist.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -918,18 +1078,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/gnet/gaddress.h b/src/gnet/gaddress.h
index b98a7b0..8fd315f 100644
--- a/src/gnet/gaddress.h
+++ b/src/gnet/gaddress.h
@@ -25,12 +25,14 @@
 #include "gstrings.h"
 #include "gexception.h"
 #include <string>
+#include <memory>
 
 namespace GNet
 {
 	class Address ;
 	class Address4 ;
 	class Address6 ;
+	class AddressLocal ;
 	class AddressStorage ;
 	class AddressStorageImp ;
 }
@@ -40,12 +42,10 @@ namespace GNet
 /// address is exposed as a 'sockaddr' structure for low-level socket
 /// operations.
 ///
-/// A double pimple pattern is used for the implementation; this class
-/// instantiates either a GNet::Address4 implementation sub-object or a
-/// GNet::Address6 sub-object depending on the address family, and forwards
-/// its method calls directly to the one instantiated sub-object. In an
-/// IPv4-only build the GNet::Address6 is forward-declared but not defined
-/// and all methods are forwarded to the GNet::Address4 sub-object.
+/// A multi-pimple pattern is used for the implementation, with implementation
+/// classes including GNet::Address4 and GNet::Address6. In an IPv4-only build
+/// the GNet::Address6 can be forward-declared but not defined, with all methods
+/// forwarded to the GNet::Address4 sub-object.
 ///
 /// \see GNet::Resolver
 ///
@@ -55,20 +55,27 @@ public:
 	enum class Family
 	{
 		ipv4 ,
-		ipv6
+		ipv6 ,
+		local
 	} ;
+	struct Domain /// Overload discriminator for Address::supports()
+		{} ;
 
 	G_EXCEPTION( Error , "address error" ) ;
 	G_EXCEPTION( BadString , "invalid address" ) ;
 	G_EXCEPTION_CLASS( BadFamily , "unsupported address family" ) ;
 
 	static bool supports( Family ) ;
-		///< Returns true if the implementation supports the given address family,
-		///< either ipv4 or ipv6.
+		///< Returns true if the implementation supports the given
+		///< address family.
 
 	static bool supports( int af , int dummy ) ;
-		///< Returns true if the implementation supports the given address family,
-		///< either AF_INET or AF_INET6.
+		///< Returns true if the implementation supports the given
+		///< address family given as AF_INET etc.
+
+	static bool supports( const Domain & , int domain ) ;
+		///< Returns true if the implementation supports the given
+		///< address domain given as PF_INET etc.
 
 	Address( const Address & ) ;
 		///< Copy constructor.
@@ -85,19 +92,11 @@ public:
 		///< fixup.
 
 	Address( Family , unsigned int port ) ;
-		///< Constructor for a wildcard INADDR_ANY address with the given port
-		///< number. Throws an exception if an invalid port number.
+		///< Constructor for a wildcard address like INADDR_ANY with the
+		///< given port number. Throws an exception if an invalid port number.
 		///< Postcondition: isAny()
 		/// \see validPort()
 
-	explicit Address( const std::string & display_string ) ;
-		///< Constructor taking a string originally obtained from displayString().
-		///< Throws an exception if an invalid string. See also validString().
-
-	Address( const std::string & ip , unsigned int port ) ;
-		///< Constructor taking an ip-address and a port number. Throws an
-		///< exception if an invalid string.
-
 	Address( Address && ) noexcept ;
 		///< Move constructor.
 
@@ -110,6 +109,31 @@ public:
 	Address & operator=( Address && ) noexcept ;
 		///< Move assignment operator.
 
+	struct NotLocal /// Overload discriminator for Address::parse()
+		{} ;
+
+	static Address parse( const std::string & display_string ) ;
+		///< Factory function for any address family. Throws if
+		///< an invalid string. See also validString().
+
+	static Address parse( const std::string & display_string , NotLocal ) ;
+		///< Factory function for Family::ipv4 or Family::ipv6.
+		///< Throws if an invalid string. See also validString().
+
+	static Address parse( const std::string & host_part_string , unsigned int port ) ;
+		///< Factory function for Family::ipv4 or Family::ipv6.
+		///< Throws if an invalid string. See also validStrings().
+
+	static Address parse( const std::string & host_part_string , const std::string & port ) ;
+		///< Factory function for Family::ipv4 or Family::ipv6.
+		///< Throws if an invalid string. See also validStrings().
+
+	static bool isFamilyLocal( const std::string & display_string ) ;
+		///< Returns true if the given address display string looks
+		///< will parse to Family::local and Family::local is
+		///< supported. The address may still fail to parse if
+		///< it is invalid.
+
 	static Address defaultAddress() ;
 		///< Returns a default address, being the IPv4 wildcard address
 		///< with a zero port number.
@@ -129,12 +153,13 @@ public:
 		///< Returns the size of the sockaddr address. See address().
 
 	std::string displayString( bool with_scope_id = false ) const ;
-		///< Returns a string which represents the transport address for
-		///< debugging and diagnostics purposes.
+		///< Returns a string which represents the transport address.
 
-	std::string hostPartString() const ;
-		///< Returns a string which represents the network address for
-		///< debugging and diagnostics purposes.
+	std::string hostPartString( bool raw = false ) const ;
+		///< Returns a string which represents the network address.
+		///< For unix-domain sockets this returns the address path
+		///< and if the 'raw' parameter is set then any non-printing
+		///< characters are not escaped.
 
 	std::string queryString() const ;
 		///< Returns a string that can be used as a prefix for rDNS or
@@ -143,14 +168,15 @@ public:
 	unsigned int port() const;
 		///< Returns port part of the address.
 
-	int domain() const ;
-		///< Returns the address 'domain', eg. PF_INET.
+	static int domain( Family ) ;
+		///< Returns the address 'domain' for the given family, eg. PF_INET
+		///< for Family::ipv4.
 
 	Family family() const ;
 		///< Returns the address family enumeration.
 
 	int af() const ;
-		///< Returns the address family number, AF_INET or AFINET6.
+		///< Returns the address family number such as AF_INET or AFINET6.
 
 	static bool validPort( unsigned int n ) ;
 		///< Returns true if the port number is within the valid range. This
@@ -160,6 +186,10 @@ public:
 		///< Returns true if the transport-address display string is valid.
 		///< This can be used to avoid exceptions from the relevant constructor.
 
+	static bool validString( const std::string & display_string , NotLocal , std::string * reason = nullptr ) ;
+		///< Returns true if the transport-address display string is valid.
+		///< This can be used to avoid exceptions from the relevant constructor.
+
 	static bool validStrings( const std::string & ip , const std::string & port_string , std::string * reason = nullptr ) ;
 		///< Returns true if the combined network-address string and port string
 		///< is valid. This can be used to avoid exceptions from the relevant
@@ -216,7 +246,7 @@ public:
 
 	bool isLocal( std::string & reason ) const ;
 		///< Returns true if this seems to be a 'local' address, ie. an
-		///< address that is inherently more trusted. Returns an
+		///< address that is likely to be more trusted. Returns an
 		///< explanation by reference otherwise.
 
 	bool is4() const ;
@@ -225,7 +255,7 @@ public:
 	bool is6() const ;
 		///< Returns true if family() is ipv6.
 
-	bool same( const Address & , bool with_scope ) const ;
+	bool same( const Address & , bool ipv6_compare_with_scope ) const ;
 		///< Comparison function.
 
 	bool operator==( const Address & ) const ;
@@ -239,10 +269,15 @@ public:
 
 private:
 	Address( Family , unsigned int , int ) ; // loopback()
+	explicit Address( const std::string & display_string ) ; // parse()
+	Address( const std::string & display_string , NotLocal ) ; // parse(NotLocal)
+	Address( const std::string & ip , const std::string & port ) ; // parse(ip,port)
+	Address( const std::string & ip , unsigned int port ) ; // parse(ip,port)
 
 private:
-	std::unique_ptr<Address4> m_4imp ;
-	std::unique_ptr<Address6> m_6imp ;
+	std::unique_ptr<Address4> m_ipv4 ;
+	std::unique_ptr<Address6> m_ipv6 ;
+	std::unique_ptr<AddressLocal> m_local ;
 } ;
 
 namespace GNet
diff --git a/src/gnet/gaddress4.cpp b/src/gnet/gaddress4.cpp
index dff190b..4c50b07 100644
--- a/src/gnet/gaddress4.cpp
+++ b/src/gnet/gaddress4.cpp
@@ -35,17 +35,17 @@ namespace GNet
 {
 	namespace Address4Imp
 	{
-		constexpr const char * port_separators = ":/" ;
+		constexpr const char * port_separators = ":" ;
 		constexpr char port_separator = ':' ;
 	}
 }
 
-unsigned short GNet::Address4::family()
+unsigned short GNet::Address4::af() noexcept
 {
 	return AF_INET ;
 }
 
-int GNet::Address4::domain()
+int GNet::Address4::domain() noexcept
 {
 	return PF_INET ;
 }
@@ -53,7 +53,7 @@ int GNet::Address4::domain()
 GNet::Address4::Address4( std::nullptr_t ) :
 	m_inet{}
 {
-	m_inet.sin_family =  family() ;
+	m_inet.sin_family =  af() ;
 	m_inet.sin_port =  0 ;
 }
 
@@ -65,7 +65,7 @@ GNet::Address4::Address4( unsigned int port ) :
 	if( reason ) throw Address::Error(reason) ;
 }
 
-GNet::Address4::Address4( unsigned int port , int ) :
+GNet::Address4::Address4( unsigned int port , int /*loopback_overload*/ ) :
 	Address4(nullptr)
 {
 	m_inet.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
@@ -73,12 +73,12 @@ GNet::Address4::Address4( unsigned int port , int ) :
 	if( reason ) throw Address::Error(reason) ;
 }
 
-GNet::Address4::Address4( const sockaddr * addr , socklen_t len ) :
+GNet::Address4::Address4( const sockaddr * addr , socklen_t len , bool ) :
 	Address4(nullptr)
 {
 	if( addr == nullptr )
 		throw Address::Error() ;
-	if( addr->sa_family != family() || static_cast<std::size_t>(len) < sizeof(sockaddr_type) )
+	if( addr->sa_family != af() || static_cast<std::size_t>(len) < sizeof(sockaddr_type) )
 		throw Address::BadFamily() ;
 
 	m_inet = *(reinterpret_cast<const sockaddr_type*>(addr)) ;
@@ -131,10 +131,10 @@ const char * GNet::Address4::setHostAddress( sockaddr_type & inet , const std::s
 {
 	// start with a stricter check than inet_pton(), inet_addr() etc. since they allow eg. "123.123"
 	if( !Address4::format(host_part) )
-		return "invalid ipv4 network address format" ;
+		return "invalid network address" ;
 
-	int rc = inet_pton( family() , host_part.c_str() , &inet.sin_addr ) ;
-	return rc == 1 ? nullptr : "invalid ipv4 network address" ;
+	int rc = inet_pton( af() , host_part.c_str() , &inet.sin_addr ) ;
+	return rc == 1 ? nullptr : "invalid network address" ;
 }
 
 void GNet::Address4::setPort( unsigned int port )
@@ -159,7 +159,16 @@ const char * GNet::Address4::setPort( sockaddr_type & inet , unsigned int port )
 	return nullptr ;
 }
 
-std::string GNet::Address4::displayString() const
+bool GNet::Address4::setZone( const std::string & /*ipv6_zone_name_or_scope_id*/ )
+{
+	return true ;
+}
+
+void GNet::Address4::setScopeId( unsigned long /*ipv6_scope_id*/ )
+{
+}
+
+std::string GNet::Address4::displayString( bool /*ipv6_with_scope*/ ) const
 {
 	std::ostringstream ss ;
 	ss << hostPartString() ;
@@ -167,15 +176,15 @@ std::string GNet::Address4::displayString() const
 	return ss.str() ;
 }
 
-std::string GNet::Address4::hostPartString() const
+std::string GNet::Address4::hostPartString( bool /*raw*/ ) const
 {
-	std::array<char,INET_ADDRSTRLEN+1U> buffer ; // NOLINT cppcoreguidelines-pro-type-member-init
+	std::array<char,INET_ADDRSTRLEN+1U> buffer {} ;
 	const void * vp = & m_inet.sin_addr ;
-	const char * p = inet_ntop( family() , const_cast<void*>(vp) , &buffer[0] , buffer.size() ) ;
+	const char * p = inet_ntop( af() , const_cast<void*>(vp) , &buffer[0] , buffer.size() ) ;
 	if( p == nullptr )
 		throw Address::Error( "inet_ntop() failure" ) ;
 	buffer[buffer.size()-1U] = '\0' ;
-	return std::string(&buffer[0]) ;
+	return { &buffer[0] } ; // sic
 }
 
 std::string GNet::Address4::queryString() const
@@ -187,7 +196,7 @@ std::string GNet::Address4::queryString() const
 
 bool GNet::Address4::validData( const sockaddr * addr , socklen_t len )
 {
-	return addr != nullptr && addr->sa_family == family() && len == sizeof(sockaddr_type) ;
+	return addr != nullptr && addr->sa_family == af() && len == sizeof(sockaddr_type) ;
 }
 
 bool GNet::Address4::validString( const std::string & s , std::string * reason_p )
@@ -218,11 +227,11 @@ bool GNet::Address4::validPort( unsigned int port )
 	return reason == nullptr ;
 }
 
-bool GNet::Address4::same( const Address4 & other ) const
+bool GNet::Address4::same( const Address4 & other , bool /*ipv6_compare_with_scope*/ ) const
 {
 	return
-		m_inet.sin_family == family() &&
-		other.m_inet.sin_family == family() &&
+		m_inet.sin_family == af() &&
+		other.m_inet.sin_family == af() &&
 		sameAddr( m_inet.sin_addr , other.m_inet.sin_addr ) &&
 		m_inet.sin_port == other.m_inet.sin_port ;
 }
@@ -230,8 +239,8 @@ bool GNet::Address4::same( const Address4 & other ) const
 bool GNet::Address4::sameHostPart( const Address4 & other ) const
 {
 	return
-		m_inet.sin_family == family() &&
-		other.m_inet.sin_family == family() &&
+		m_inet.sin_family == af() &&
+		other.m_inet.sin_family == af() &&
 		sameAddr( m_inet.sin_addr , other.m_inet.sin_addr ) ;
 }
 
@@ -245,6 +254,11 @@ unsigned int GNet::Address4::port() const
 	return ntohs( m_inet.sin_port ) ;
 }
 
+unsigned long GNet::Address4::scopeId( unsigned long default_ ) const
+{
+	return default_ ;
+}
+
 const sockaddr * GNet::Address4::address() const
 {
 	return reinterpret_cast<const sockaddr*>(&m_inet) ;
@@ -273,8 +287,10 @@ G::StringArray GNet::Address4::wildcards() const
 	G::Str::splitIntoFields( ip_string , part , "." ) ;
 
 	G_ASSERT( part.size() == 4U ) ;
-	if( part.size() != 4U ||
-		part[0].empty() || !G::Str::isUInt(part[0]) ||
+	if( part.size() != 4U )
+		return result ;
+
+	if( part[0].empty() || !G::Str::isUInt(part[0]) ||
 		part[1].empty() || !G::Str::isUInt(part[1]) ||
 		part[2].empty() || !G::Str::isUInt(part[2]) ||
 		part[3].empty() || !G::Str::isUInt(part[3]) )
@@ -304,41 +320,41 @@ G::StringArray GNet::Address4::wildcards() const
 
 	const std::string empty ;
 
-	add( result , part_0_1_2 , n3 & 0xff , "/32" ) ;
-	add( result , part_0_1_2 , n3 & 0xfe , "/31" ) ;
-	add( result , part_0_1_2 , n3 & 0xfc , "/30" ) ;
-	add( result , part_0_1_2 , n3 & 0xf8 , "/29" ) ;
-	add( result , part_0_1_2 , n3 & 0xf0 , "/28" ) ;
-	add( result , part_0_1_2 , n3 & 0xe0 , "/27" ) ;
-	add( result , part_0_1_2 , n3 & 0xc0 , "/26" ) ;
-	add( result , part_0_1_2 , n3 & 0x80 , "/25" ) ;
+	add( result , part_0_1_2 , n3 & 0xffU , "/32" ) ;
+	add( result , part_0_1_2 , n3 & 0xfeU , "/31" ) ;
+	add( result , part_0_1_2 , n3 & 0xfcU , "/30" ) ;
+	add( result , part_0_1_2 , n3 & 0xf8U , "/29" ) ;
+	add( result , part_0_1_2 , n3 & 0xf0U , "/28" ) ;
+	add( result , part_0_1_2 , n3 & 0xe0U , "/27" ) ;
+	add( result , part_0_1_2 , n3 & 0xc0U , "/26" ) ;
+	add( result , part_0_1_2 , n3 & 0x80U , "/25" ) ;
 	add( result , part_0_1_2 , 0 , "/24" ) ;
 	add( result , part_0_1_2 , "*" ) ;
-	add( result , part_0_1 , n2 & 0xfe , ".0/23" ) ;
-	add( result , part_0_1 , n2 & 0xfc , ".0/22" ) ;
-	add( result , part_0_1 , n2 & 0xfc , ".0/21" ) ;
-	add( result , part_0_1 , n2 & 0xf8 , ".0/20" ) ;
-	add( result , part_0_1 , n2 & 0xf0 , ".0/19" ) ;
-	add( result , part_0_1 , n2 & 0xe0 , ".0/18" ) ;
-	add( result , part_0_1 , n2 & 0xc0 , ".0/17" ) ;
+	add( result , part_0_1 , n2 & 0xfeU , ".0/23" ) ;
+	add( result , part_0_1 , n2 & 0xfcU , ".0/22" ) ;
+	add( result , part_0_1 , n2 & 0xfcU , ".0/21" ) ;
+	add( result , part_0_1 , n2 & 0xf8U , ".0/20" ) ;
+	add( result , part_0_1 , n2 & 0xf0U , ".0/19" ) ;
+	add( result , part_0_1 , n2 & 0xe0U , ".0/18" ) ;
+	add( result , part_0_1 , n2 & 0xc0U , ".0/17" ) ;
 	add( result , part_0_1 , 0 , ".0/16" ) ;
 	add( result , part_0_1 , "*.*" ) ;
-	add( result , part_0 , n1 & 0xfe , ".0.0/15" ) ;
-	add( result , part_0 , n1 & 0xfc , ".0.0/14" ) ;
-	add( result , part_0 , n1 & 0xf8 , ".0.0/13" ) ;
-	add( result , part_0 , n1 & 0xf0 , ".0.0/12" ) ;
-	add( result , part_0 , n1 & 0xe0 , ".0.0/11" ) ;
-	add( result , part_0 , n1 & 0xc0 , ".0.0/10" ) ;
-	add( result , part_0 , n1 & 0x80 , ".0.0/9" ) ;
+	add( result , part_0 , n1 & 0xfeU , ".0.0/15" ) ;
+	add( result , part_0 , n1 & 0xfcU , ".0.0/14" ) ;
+	add( result , part_0 , n1 & 0xf8U , ".0.0/13" ) ;
+	add( result , part_0 , n1 & 0xf0U , ".0.0/12" ) ;
+	add( result , part_0 , n1 & 0xe0U , ".0.0/11" ) ;
+	add( result , part_0 , n1 & 0xc0U , ".0.0/10" ) ;
+	add( result , part_0 , n1 & 0x80U , ".0.0/9" ) ;
 	add( result , part_0 , 0 , ".0.0/8" ) ;
 	add( result , part_0 , "*.*.*" ) ;
-	add( result , empty , n0 & 0xfe , ".0.0.0/7" ) ;
-	add( result , empty , n0 & 0xfc , ".0.0.0/6" ) ;
-	add( result , empty , n0 & 0xf8 , ".0.0.0/5" ) ;
-	add( result , empty , n0 & 0xf0 , ".0.0.0/4" ) ;
-	add( result , empty , n0 & 0xe0 , ".0.0.0/3" ) ;
-	add( result , empty , n0 & 0xc0 , ".0.0.0/2" ) ;
-	add( result , empty , n0 & 0x80 , ".0.0.0/1" ) ;
+	add( result , empty , n0 & 0xfeU , ".0.0.0/7" ) ;
+	add( result , empty , n0 & 0xfcU , ".0.0.0/6" ) ;
+	add( result , empty , n0 & 0xf8U , ".0.0.0/5" ) ;
+	add( result , empty , n0 & 0xf0U , ".0.0.0/4" ) ;
+	add( result , empty , n0 & 0xe0U , ".0.0.0/3" ) ;
+	add( result , empty , n0 & 0xc0U , ".0.0.0/2" ) ;
+	add( result , empty , n0 & 0x80U , ".0.0.0/1" ) ;
 	add( result , empty , 0 , ".0.0.0/0" ) ;
 	add( result , empty , "*.*.*.*" ) ;
 
@@ -383,7 +399,7 @@ unsigned int GNet::Address4::bits() const
 {
 	const unsigned long a = ntohl( m_inet.sin_addr.s_addr ) ;
 	unsigned int count = 0U ;
-	for( unsigned long mask = 0x80000000U ; mask && ( a & mask ) ; mask >>= 1 )
+	for( unsigned long mask = 0x80000000U ; mask && ( a & mask ) ; mask >>= 1U )
 		count++ ;
 	return count ;
 }
@@ -408,22 +424,22 @@ bool GNet::Address4::isLocal( std::string & reason ) const
 bool GNet::Address4::isLoopback() const
 {
 	// RFC-1918, RFC-6890
-	return ( ntohl(m_inet.sin_addr.s_addr) >> 24 ) == 127U ; // 127.0.0.0/8
+	return ( ntohl(m_inet.sin_addr.s_addr) >> 24U ) == 127U ; // 127.0.0.0/8
 }
 
 bool GNet::Address4::isLinkLocal() const
 {
 	// RFC-3927, RFC-6890
-	return ( ntohl(m_inet.sin_addr.s_addr) >> 16 ) == 0xA9FE ; // 169.254.0.0/16
+	return ( ntohl(m_inet.sin_addr.s_addr) >> 16U ) == 0xA9FEU ; // 169.254.0.0/16
 }
 
 bool GNet::Address4::isUniqueLocal() const
 {
 	// RFC-1918, RFC-6890
 	return
-		( ntohl(m_inet.sin_addr.s_addr) >> 24 ) == 0x0A || // 10.0.0.0/8
-		( ntohl(m_inet.sin_addr.s_addr) >> 20 ) == 0xAC1 || // 172.16.0.0/12
-		( ntohl(m_inet.sin_addr.s_addr) >> 16 ) == 0xC0A8 ; // 192.168.0.0/16
+		( ntohl(m_inet.sin_addr.s_addr) >> 24U ) == 0x0AU || // 10.0.0.0/8
+		( ntohl(m_inet.sin_addr.s_addr) >> 20U ) == 0xAC1U || // 172.16.0.0/12
+		( ntohl(m_inet.sin_addr.s_addr) >> 16U ) == 0xC0A8U ; // 192.168.0.0/16
 }
 
 bool GNet::Address4::isAny() const
diff --git a/src/gnet/gaddress4.h b/src/gnet/gaddress4.h
index eead101..2a687db 100644
--- a/src/gnet/gaddress4.h
+++ b/src/gnet/gaddress4.h
@@ -37,30 +37,30 @@ class GNet::Address4
 {
 public:
 	using sockaddr_type = sockaddr_in ;
-	using storage_type = sockaddr_storage ;
 
 	explicit Address4( unsigned int ) ;
 	explicit Address4( const std::string & ) ;
 	Address4( const std::string & , const std::string & ) ;
 	Address4( const std::string & , unsigned int ) ;
-	Address4( unsigned int port , int /*for overload resolution*/ ) ; // canonical loopback address
-	Address4( const sockaddr * addr , socklen_t len ) ;
+	Address4( unsigned int port , int /*loopback_overload*/ ) ; // canonical loopback address
+	Address4( const sockaddr * addr , socklen_t len , bool ipv6_scope_id_fixup = false ) ;
 
-	static int domain() ;
-	static unsigned short family() ;
+	static int domain() noexcept ;
+	static unsigned short af() noexcept ;
 	const sockaddr * address() const ;
 	sockaddr * address() ;
 	static socklen_t length() noexcept ;
-
+	unsigned long scopeId( unsigned long default_ = 0UL ) const ;
 	unsigned int port() const ;
 	void setPort( unsigned int port ) ;
-
+	bool setZone( const std::string & ipv6_zone_name_or_scope_id ) ;
+	void setScopeId( unsigned long ipv6_scope_id ) ;
 	static bool validString( const std::string & , std::string * = nullptr ) ;
 	static bool validStrings( const std::string & , const std::string & , std::string * = nullptr ) ;
 	static bool validPort( unsigned int port ) ;
 	static bool validData( const sockaddr * addr , socklen_t len ) ;
 
-	bool same( const Address4 & other ) const ;
+	bool same( const Address4 & other , bool ipv6_compare_with_scope = false ) const ;
 	bool sameHostPart( const Address4 & other ) const ;
 	bool isLoopback() const ;
 	bool isLocal( std::string & ) const ;
@@ -68,8 +68,8 @@ public:
 	bool isUniqueLocal() const ;
 	bool isAny() const ;
 	unsigned int bits() const ;
-	std::string displayString() const ;
-	std::string hostPartString() const ;
+	std::string displayString( bool ipv6_with_scope = false ) const ;
+	std::string hostPartString( bool raw = false ) const ;
 	std::string queryString() const ;
 	G::StringArray wildcards() const ;
 	static bool format( std::string ) ;
diff --git a/src/gnet/gaddress6.cpp b/src/gnet/gaddress6.cpp
index ec32443..8fe65da 100644
--- a/src/gnet/gaddress6.cpp
+++ b/src/gnet/gaddress6.cpp
@@ -26,6 +26,7 @@
 #include "glog.h"
 #include <algorithm> // std::swap()
 #include <utility> // std::swap()
+#include <cstring> // std::memcpy()
 #include <climits>
 #include <sys/types.h>
 #include <sstream>
@@ -37,17 +38,17 @@ namespace GNet
 {
 	namespace Address6Imp
 	{
-		const char * port_separators = ":/." ;
+		const char * port_separators = ":." ;
 		char port_separator = '.' ;
 	}
 }
 
-unsigned short GNet::Address6::family()
+unsigned short GNet::Address6::af() noexcept
 {
 	return AF_INET6 ;
 }
 
-int GNet::Address6::domain()
+int GNet::Address6::domain() noexcept
 {
 	return PF_INET6 ;
 }
@@ -55,7 +56,7 @@ int GNet::Address6::domain()
 GNet::Address6::Address6( std::nullptr_t ) :
 	m_inet{}
 {
-	m_inet.sin6_family = family() ;
+	m_inet.sin6_family = af() ;
 	m_inet.sin6_port = 0 ;
 	m_inet.sin6_flowinfo = 0 ;
 	gdef_address6_init( m_inet ) ; // gdef.h
@@ -69,7 +70,7 @@ GNet::Address6::Address6( unsigned int port ) :
 	if( reason ) throw Address::Error(reason) ;
 }
 
-GNet::Address6::Address6( unsigned int port , int ) :
+GNet::Address6::Address6( unsigned int port , int /*loopback_overload*/ ) :
 	Address6(nullptr)
 {
 	m_inet.sin6_addr = in6addr_loopback ;
@@ -77,23 +78,23 @@ GNet::Address6::Address6( unsigned int port , int ) :
 	if( reason ) throw Address::Error(reason) ;
 }
 
-GNet::Address6::Address6( const sockaddr * addr , socklen_t len , bool scope_id_fixup ) :
+GNet::Address6::Address6( const sockaddr * addr , socklen_t len , bool ipv6_scope_id_fixup ) :
 	Address6(nullptr)
 {
 	if( addr == nullptr )
 		throw Address::Error() ;
-	if( addr->sa_family != family() || static_cast<std::size_t>(len) < sizeof(sockaddr_type) )
+	if( addr->sa_family != af() || static_cast<std::size_t>(len) < sizeof(sockaddr_type) )
 		throw Address::BadFamily() ;
 
 	std::memcpy( &m_inet , addr , sizeof(m_inet) ) ;
 
-	if( scope_id_fixup ) // for eg. NetBSD v7 getifaddrs() -- see FreeBSD Handbook "Scope Index"
+	if( ipv6_scope_id_fixup ) // for eg. NetBSD v7 getifaddrs() -- see FreeBSD Handbook "Scope Index"
 	{
 		auto hi = static_cast<unsigned int>( m_inet.sin6_addr.s6_addr[2] ) ;
 		auto lo = static_cast<unsigned int>( m_inet.sin6_addr.s6_addr[3] ) ;
 		m_inet.sin6_addr.s6_addr[2] = 0 ;
 		m_inet.sin6_addr.s6_addr[3] = 0 ;
-		m_inet.sin6_scope_id = ( hi << 8 | lo ) ;
+		m_inet.sin6_scope_id = ( hi << 8U | lo ) ;
 	}
 }
 
@@ -155,7 +156,7 @@ const char * GNet::Address6::setHostAddress( sockaddr_type & inet , const std::s
 	std::string zone = G::Str::tail( host_part , host_part.find('%') , std::string() ) ;
 	std::string host_part_head = G::Str::head( host_part , host_part.find('%') , host_part ) ;
 
-	int rc = inet_pton( family() , host_part_head.c_str() , &inet.sin6_addr ) ;
+	int rc = inet_pton( af() , host_part_head.c_str() , &inet.sin6_addr ) ;
 
 	if( rc == 1 && !zone.empty() )
 	{
@@ -211,30 +212,30 @@ bool GNet::Address6::setZone( sockaddr_type & inet , const std::string & zone )
 	return no_overflow ;
 }
 
-void GNet::Address6::setScopeId( unsigned long scope_id )
+void GNet::Address6::setScopeId( unsigned long ipv6_scope_id )
 {
-	m_inet.sin6_scope_id = scope_id ; // narrowing conversion on unix
+	m_inet.sin6_scope_id = ipv6_scope_id ; // narrowing conversion on unix
 }
 
-std::string GNet::Address6::displayString( bool with_scope_id ) const
+std::string GNet::Address6::displayString( bool ipv6_with_scope_id ) const
 {
 	std::ostringstream ss ;
 	ss << hostPartString() ;
-	if( with_scope_id && scopeId() != 0U )
+	if( ipv6_with_scope_id && scopeId() != 0U )
 		ss << "%" << scopeId() ;
 	ss << Address6Imp::port_separator << port() ;
 	return ss.str() ;
 }
 
-std::string GNet::Address6::hostPartString() const
+std::string GNet::Address6::hostPartString( bool /*raw*/ ) const
 {
-	std::array<char,INET6_ADDRSTRLEN+1U> buffer ; // NOLINT cppcoreguidelines-pro-type-member-init
+	std::array<char,INET6_ADDRSTRLEN+1U> buffer {} ;
 	const void * vp = & m_inet.sin6_addr ;
-	const char * p = inet_ntop( family() , const_cast<void*>(vp) , &buffer[0] , buffer.size() ) ; // cast for win32
+	const char * p = inet_ntop( af() , const_cast<void*>(vp) , &buffer[0] , buffer.size() ) ; // cast for win32
 	if( p == nullptr )
 		throw Address::Error( "inet_ntop() failure" ) ;
 	buffer[buffer.size()-1U] = '\0' ;
-	return std::string(&buffer[0]) ;
+	return { &buffer[0] } ; // sic
 }
 
 std::string GNet::Address6::queryString() const
@@ -251,7 +252,7 @@ std::string GNet::Address6::queryString() const
 
 bool GNet::Address6::validData( const sockaddr * addr , socklen_t len )
 {
-	return addr != nullptr && addr->sa_family == family() && len == sizeof(sockaddr_type) ;
+	return addr != nullptr && addr->sa_family == af() && len == sizeof(sockaddr_type) ;
 }
 
 bool GNet::Address6::validString( const std::string & s , std::string * reason_p )
@@ -285,8 +286,8 @@ bool GNet::Address6::validPort( unsigned int port )
 bool GNet::Address6::same( const Address6 & other , bool with_scope ) const
 {
 	return
-		m_inet.sin6_family == family() &&
-		other.m_inet.sin6_family == family() &&
+		m_inet.sin6_family == af() &&
+		other.m_inet.sin6_family == af() &&
 		sameAddr( m_inet.sin6_addr , other.m_inet.sin6_addr ) &&
 		( !with_scope || m_inet.sin6_scope_id == other.m_inet.sin6_scope_id ) &&
 		m_inet.sin6_port == other.m_inet.sin6_port ;
@@ -295,8 +296,8 @@ bool GNet::Address6::same( const Address6 & other , bool with_scope ) const
 bool GNet::Address6::sameHostPart( const Address6 & other , bool with_scope ) const
 {
 	return
-		m_inet.sin6_family == family() &&
-		other.m_inet.sin6_family == family() &&
+		m_inet.sin6_family == af() &&
+		other.m_inet.sin6_family == af() &&
 		sameAddr( m_inet.sin6_addr , other.m_inet.sin6_addr ) &&
 		( !with_scope || m_inet.sin6_scope_id == other.m_inet.sin6_scope_id ) ;
 }
@@ -316,7 +317,7 @@ unsigned int GNet::Address6::port() const
 	return ntohs( m_inet.sin6_port ) ;
 }
 
-unsigned long GNet::Address6::scopeId() const
+unsigned long GNet::Address6::scopeId( unsigned long /*default*/ ) const
 {
 	return m_inet.sin6_scope_id ;
 }
diff --git a/src/gnet/gaddress6.h b/src/gnet/gaddress6.h
index d79205d..55ce89b 100644
--- a/src/gnet/gaddress6.h
+++ b/src/gnet/gaddress6.h
@@ -37,40 +37,39 @@ class GNet::Address6
 {
 public:
 	using sockaddr_type = sockaddr_in6 ;
-	using storage_type = sockaddr_storage ;
 
 	explicit Address6( unsigned int ) ;
 	explicit Address6( const std::string & ) ;
 	Address6( const std::string & , const std::string & ) ;
 	Address6( const std::string & , unsigned int ) ;
 	Address6( unsigned int port , int /*for overload resolution*/ ) ; // canonical loopback address
-	Address6( const sockaddr * addr , socklen_t len , bool = false ) ;
+	Address6( const sockaddr * addr , socklen_t len , bool ipv6_scope_id_fixup = false ) ;
 
-	static int domain() ;
-	static unsigned short family() ;
+	static int domain() noexcept ;
+	static unsigned short af() noexcept ;
 	const sockaddr * address() const ;
 	sockaddr * address() ;
 	static socklen_t length() noexcept ;
-	unsigned long scopeId() const ;
+	unsigned long scopeId( unsigned long default_ = 0UL ) const ;
 	unsigned int port() const ;
 	void setPort( unsigned int port ) ;
-	bool setZone( const std::string & zone_name_or_scope_id ) ;
-	void setScopeId( unsigned long ) ;
+	bool setZone( const std::string & ipv6_zone_name_or_scope_id ) ;
+	void setScopeId( unsigned long ipv6_scope_id ) ;
 	static bool validString( const std::string & , std::string * = nullptr ) ;
 	static bool validStrings( const std::string & , const std::string & , std::string * = nullptr ) ;
 	static bool validPort( unsigned int port ) ;
 	static bool validData( const sockaddr * addr , socklen_t len ) ;
 
-	bool same( const Address6 & other , bool with_scope = false ) const ;
-	bool sameHostPart( const Address6 & other , bool with_scope = false ) const ;
+	bool same( const Address6 & other , bool ipv6_compare_with_scope = false ) const ;
+	bool sameHostPart( const Address6 & other , bool ipv6_compare_with_scope = false ) const ;
 	bool isLoopback() const ;
 	bool isLocal( std::string & ) const ;
 	bool isLinkLocal() const ;
 	bool isUniqueLocal() const ;
 	bool isAny() const ;
 	unsigned int bits() const ;
-	std::string displayString( bool ) const ;
-	std::string hostPartString() const ;
+	std::string displayString( bool ipv6_with_scope = false ) const ;
+	std::string hostPartString( bool raw = false ) const ;
 	std::string queryString() const ;
 	G::StringArray wildcards() const ;
 
diff --git a/src/gnet/gaddress_ipv4.cpp b/src/gnet/gaddress_ipv4.cpp
index b2c8d1e..9f8bf96 100644
--- a/src/gnet/gaddress_ipv4.cpp
+++ b/src/gnet/gaddress_ipv4.cpp
@@ -31,6 +31,9 @@ namespace GNet
 	class Address6
 	{
 	} ;
+	class AddressLocal
+	{
+	} ;
 	namespace AddressImp
 	{
 		void check( GNet::Address::Family f )
@@ -51,55 +54,70 @@ bool GNet::Address::supports( int af , int )
 	return af == AF_INET ;
 }
 
+bool GNet::Address::supports( const Address::Domain & , int domain )
+{
+	return domain == Address4::domain() ;
+}
+
 GNet::Address GNet::Address::defaultAddress()
 {
-	return Address( Family::ipv4 , 0U ) ;
+	return { Family::ipv4 , 0U } ;
 }
 
 GNet::Address::Address( Family f , unsigned int port ) :
-	m_4imp(std::make_unique<Address4>(port))
+	m_ipv4(std::make_unique<Address4>(port))
 {
 	AddressImp::check( f ) ;
 }
 
 GNet::Address::Address( const AddressStorage & storage ) :
-	m_4imp(std::make_unique<Address4>(storage.p(),storage.n()))
+	m_ipv4(std::make_unique<Address4>(storage.p(),storage.n()))
 {
 }
 
 GNet::Address::Address( const sockaddr * addr , socklen_t len ) :
-	m_4imp(std::make_unique<Address4>(addr,len))
+	m_ipv4(std::make_unique<Address4>(addr,len))
 {
 }
 
 GNet::Address::Address( const sockaddr * addr , socklen_t len , bool ) :
-	m_4imp(std::make_unique<Address4>(addr,len))
+	m_ipv4(std::make_unique<Address4>(addr,len))
 {
 }
 
 GNet::Address::Address( const std::string & s ) :
-	m_4imp(std::make_unique<Address4>(s))
+	m_ipv4(std::make_unique<Address4>(s))
+{
+}
+
+GNet::Address::Address( const std::string & s , NotLocal ) :
+	m_ipv4(std::make_unique<Address4>(s))
+{
+}
+
+GNet::Address::Address( const std::string & host_part , const std::string & port_part ) :
+	m_ipv4(std::make_unique<Address4>(host_part,port_part))
 {
 }
 
 GNet::Address::Address( const std::string & s , unsigned int port ) :
-	m_4imp(std::make_unique<Address4>(s,port))
+	m_ipv4(std::make_unique<Address4>(s,port))
 {
 }
 
 GNet::Address::Address( Family f , unsigned int port , int loopback_overload ) :
-	m_4imp(std::make_unique<Address4>(port,loopback_overload))
+	m_ipv4(std::make_unique<Address4>(port,loopback_overload))
 {
 	AddressImp::check( f ) ;
 }
 
 GNet::Address::Address( const Address & other ) :
-	m_4imp(std::make_unique<Address4>(*other.m_4imp))
+	m_ipv4(std::make_unique<Address4>(*other.m_ipv4))
 {
 }
 
 GNet::Address::Address( Address && other ) noexcept
-=default ;
+= default ;
 
 GNet::Address::~Address()
 = default;
@@ -107,7 +125,7 @@ GNet::Address::~Address()
 void GNet::Address::swap( Address & other ) noexcept
 {
 	using std::swap ;
-	swap( m_4imp , other.m_4imp ) ;
+	swap( m_ipv4 , other.m_ipv4 ) ;
 }
 
 GNet::Address & GNet::Address::operator=( const Address & other )
@@ -119,6 +137,31 @@ GNet::Address & GNet::Address::operator=( const Address & other )
 GNet::Address & GNet::Address::operator=( Address && other ) noexcept
 = default ;
 
+GNet::Address GNet::Address::parse( const std::string & s )
+{
+	return Address( s ) ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & s , Address::NotLocal not_local )
+{
+	return { s , not_local } ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & host_part , unsigned int port )
+{
+	return { host_part , port } ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & host_part , const std::string & port_part )
+{
+	return { host_part , port_part } ;
+}
+
+bool GNet::Address::isFamilyLocal( const std::string & )
+{
+	return false ;
+}
+
 GNet::Address GNet::Address::loopback( Family f , unsigned int port )
 {
 	return Address( f , port , 1 ) ;
@@ -126,7 +169,7 @@ GNet::Address GNet::Address::loopback( Family f , unsigned int port )
 
 GNet::Address & GNet::Address::setPort( unsigned int port )
 {
-	m_4imp->setPort( port ) ;
+	m_ipv4->setPort( port ) ;
 	return *this ;
 }
 
@@ -142,32 +185,32 @@ bool GNet::Address::setZone( const std::string & )
 
 unsigned int GNet::Address::bits() const
 {
-	return m_4imp->bits() ;
+	return m_ipv4->bits() ;
 }
 
 bool GNet::Address::isLoopback() const
 {
-	return m_4imp->isLoopback() ;
+	return m_ipv4->isLoopback() ;
 }
 
 bool GNet::Address::isLocal( std::string & reason ) const
 {
-	return m_4imp->isLocal( reason ) ;
+	return m_ipv4->isLocal( reason ) ;
 }
 
 bool GNet::Address::isLinkLocal() const
 {
-	return m_4imp->isLinkLocal() ;
+	return m_ipv4->isLinkLocal() ;
 }
 
 bool GNet::Address::isUniqueLocal() const
 {
-	return m_4imp->isUniqueLocal() ;
+	return m_ipv4->isUniqueLocal() ;
 }
 
 bool GNet::Address::isAny() const
 {
-	return m_4imp->isAny() ;
+	return m_ipv4->isAny() ;
 }
 
 bool GNet::Address::is4() const
@@ -182,12 +225,12 @@ bool GNet::Address::is6() const
 
 bool GNet::Address::same( const Address & other , bool ) const
 {
-	return m_4imp->same( *other.m_4imp ) ;
+	return m_ipv4->same( *other.m_ipv4 ) ;
 }
 
 bool GNet::Address::operator==( const Address & other ) const
 {
-	return m_4imp->same( *other.m_4imp ) ;
+	return m_ipv4->same( *other.m_ipv4 ) ;
 }
 
 bool GNet::Address::operator!=( const Address & other ) const
@@ -197,22 +240,22 @@ bool GNet::Address::operator!=( const Address & other ) const
 
 bool GNet::Address::sameHostPart( const Address & other ) const
 {
-	return m_4imp->sameHostPart(*other.m_4imp) ;
+	return m_ipv4->sameHostPart(*other.m_ipv4) ;
 }
 
 std::string GNet::Address::displayString( bool ) const
 {
-	return m_4imp->displayString() ;
+	return m_ipv4->displayString() ;
 }
 
-std::string GNet::Address::hostPartString() const
+std::string GNet::Address::hostPartString( bool ) const
 {
-	return m_4imp->hostPartString() ;
+	return m_ipv4->hostPartString() ;
 }
 
 std::string GNet::Address::queryString() const
 {
-	return m_4imp->queryString() ;
+	return m_ipv4->queryString() ;
 }
 
 bool GNet::Address::validString( const std::string & s , std::string * reason_p )
@@ -220,6 +263,11 @@ bool GNet::Address::validString( const std::string & s , std::string * reason_p
 	return Address4::validString( s , reason_p ) ;
 }
 
+bool GNet::Address::validString( const std::string & s , NotLocal , std::string * reason_p )
+{
+	return Address4::validString( s , reason_p ) ;
+}
+
 bool GNet::Address::validStrings( const std::string & s1 , const std::string & s2 , std::string * reason_p )
 {
 	return Address4::validStrings( s1 , s2 , reason_p ) ;
@@ -227,12 +275,12 @@ bool GNet::Address::validStrings( const std::string & s1 , const std::string & s
 
 sockaddr * GNet::Address::address()
 {
-	return m_4imp->address() ;
+	return m_ipv4->address() ;
 }
 
 const sockaddr * GNet::Address::address() const
 {
-	return m_4imp->address() ;
+	return m_ipv4->address() ;
 }
 
 socklen_t GNet::Address::length() const
@@ -242,7 +290,7 @@ socklen_t GNet::Address::length() const
 
 unsigned int GNet::Address::port() const
 {
-	return m_4imp->port() ;
+	return m_ipv4->port() ;
 }
 
 unsigned long GNet::Address::scopeId( unsigned long default_ ) const
@@ -260,9 +308,9 @@ bool GNet::Address::validData( const sockaddr * addr , socklen_t len )
 	return Address4::validData( addr , len ) ;
 }
 
-int GNet::Address::domain() const
+int GNet::Address::domain( Family family )
 {
-	return Address4::domain() ;
+	return family == Family::ipv4 ? Address4::domain() : 0 ;
 }
 
 GNet::Address::Family GNet::Address::family() const
@@ -277,7 +325,7 @@ int GNet::Address::af() const
 
 G::StringArray GNet::Address::wildcards() const
 {
-	return m_4imp->wildcards() ;
+	return m_ipv4->wildcards() ;
 }
 
 // ==
@@ -288,7 +336,7 @@ G::StringArray GNet::Address::wildcards() const
 class GNet::AddressStorageImp
 {
 public:
-	Address4::storage_type u ;
+	sockaddr_storage u ;
 	socklen_t n ;
 } ;
 
@@ -297,9 +345,9 @@ public:
 GNet::AddressStorage::AddressStorage() :
 	m_imp(std::make_unique<AddressStorageImp>())
 {
-	static_assert( sizeof(Address4::sockaddr_type) <= sizeof(Address4::storage_type) , "" ) ;
-	static_assert( alignof(Address4::sockaddr_type) <= alignof(Address4::storage_type) , "" ) ;
-	m_imp->n = sizeof( Address4::storage_type ) ;
+	static_assert( sizeof(Address4::sockaddr_type) <= sizeof(sockaddr_storage) , "" ) ;
+	static_assert( alignof(Address4::sockaddr_type) <= alignof(sockaddr_storage) , "" ) ;
+	m_imp->n = sizeof( sockaddr_storage ) ;
 }
 
 GNet::AddressStorage::~AddressStorage()
diff --git a/src/gnet/gaddress_ipv6.cpp b/src/gnet/gaddress_ipv6.cpp
index 4b0b474..f4957b9 100644
--- a/src/gnet/gaddress_ipv6.cpp
+++ b/src/gnet/gaddress_ipv6.cpp
@@ -21,105 +21,170 @@
 #include "gdef.h"
 #include "gaddress4.h"
 #include "gaddress6.h"
+#include "gaddresslocal.h"
 #include "gaddress.h"
+#include "gstr.h"
 #include "gassert.h"
 #include <algorithm> // std::swap()
 #include <utility> // std::swap()
 #include <sstream>
 #include <cstring>
 
-namespace GNet
+bool GNet::Address::supports( Family f )
 {
-	namespace AddressImp
-	{
-		static bool is4( const sockaddr * p )
-		{
-			return p && p->sa_family == GNet::Address4::family() ;
-		}
-		static bool is4( const std::string & s )
-		{
-			std::string r ;
-			return GNet::Address4::validString(s,&r) ;
-		}
-		static bool is4( const std::string & s , unsigned int )
-		{
-			std::string r ;
-			return GNet::Address4::validStrings(s,"0",&r) ;
-		}
-		template <typename... Args>
-		std::unique_ptr<Address4> make_4_if( bool b , Args&&... args )
-		{
-			return b ? std::make_unique<Address4>(std::forward<Args>(args)...) : std::unique_ptr<Address4>() ;
-		}
-		template <typename... Args>
-		std::unique_ptr<Address6> make_6_if( bool b , Args&&... args )
-		{
-			return b ? std::make_unique<Address6>(std::forward<Args>(args)...) : std::unique_ptr<Address6>() ;
-		}
-	}
-}
-
-bool GNet::Address::supports( Family )
-{
-	return true ;
+	if( f == Address::Family::local && AddressLocal::af() == 0 )
+		return false ;
+	else
+		return true ;
 }
 
 bool GNet::Address::supports( int af , int )
 {
-	return af == AF_INET || af == AF_INET6 ;
+	return af == Address4::af() || af == Address6::af() || af == AddressLocal::af() ;
 }
 
-GNet::Address GNet::Address::defaultAddress()
+bool GNet::Address::supports( const Address::Domain & , int domain )
 {
-	return Address( Family::ipv4 , 0U ) ;
+	return domain == Address4::domain() || domain == Address6::domain() || domain == AddressLocal::domain() ;
 }
 
-GNet::Address::Address( Family f , unsigned int port ) :
-	m_4imp(AddressImp::make_4_if(f==Family::ipv4,port)) ,
-	m_6imp(AddressImp::make_6_if(f!=Family::ipv4,port))
+GNet::Address::Address( Family f , unsigned int port )
 {
+	if( Address4::af() && f == Address::Family::ipv4 )
+		m_ipv4 = std::make_unique<Address4>( port ) ;
+	else if( Address6::af() && f == Address::Family::ipv6 )
+		m_ipv6 = std::make_unique<Address6>( port ) ;
+	else if( AddressLocal::af() && f == Address::Family::local )
+		m_local = std::make_unique<AddressLocal>( port ) ;
+	else
+		throw Address::BadFamily() ;
 }
 
-GNet::Address::Address( const AddressStorage & storage ) :
-	m_4imp(AddressImp::make_4_if(AddressImp::is4(storage.p()),storage.p(),storage.n())) ,
-	m_6imp(AddressImp::make_6_if(!AddressImp::is4(storage.p()),storage.p(),storage.n()))
+GNet::Address::Address( const AddressStorage & storage )
 {
+	if( storage.p()->sa_family == 0 )
+		throw Address::BadFamily() ;
+	else if( Address4::af() && storage.p()->sa_family == Address4::af() )
+		m_ipv4 = std::make_unique<Address4>( storage.p() , storage.n() ) ;
+	else if( Address6::af() && storage.p()->sa_family == Address6::af() )
+		m_ipv6 = std::make_unique<Address6>( storage.p() , storage.n() ) ;
+	else if( AddressLocal::af() && storage.p()->sa_family == AddressLocal::af() )
+		m_local = std::make_unique<AddressLocal>( storage.p() , storage.n() ) ;
+	else
+		throw Address::BadFamily() ;
 }
 
-GNet::Address::Address( const sockaddr * addr , socklen_t len ) :
-	m_4imp(AddressImp::make_4_if(AddressImp::is4(addr),addr,len)) ,
-	m_6imp(AddressImp::make_6_if(!AddressImp::is4(addr),addr,len))
+GNet::Address::Address( const sockaddr * addr , socklen_t len )
 {
+	if( addr == nullptr || len < sizeof(sockaddr::sa_family) )
+		throw Address::Error() ;
+	else if( addr->sa_family == 0 )
+		throw Address::BadFamily() ;
+	else if( Address4::af() && addr->sa_family == Address4::af() )
+		m_ipv4 = std::make_unique<Address4>( addr , len ) ;
+	else if( Address6::af() && addr->sa_family == Address6::af() )
+		m_ipv6 = std::make_unique<Address6>( addr , len ) ;
+	else if( AddressLocal::af() && addr->sa_family == AddressLocal::af() )
+		m_local = std::make_unique<AddressLocal>( addr , len ) ;
+	else
+		throw Address::BadFamily() ;
 }
 
-GNet::Address::Address( const sockaddr * addr , socklen_t len , bool scope_id_fixup ) :
-	m_4imp(AddressImp::make_4_if(AddressImp::is4(addr),addr,len)) ,
-	m_6imp(AddressImp::make_6_if(!AddressImp::is4(addr),addr,len,scope_id_fixup))
+GNet::Address::Address( const sockaddr * addr , socklen_t len , bool ipv6_scope_id_fixup )
 {
+	if( addr == nullptr || len < sizeof(sockaddr::sa_family) )
+		throw Address::Error() ;
+	else if( addr->sa_family == 0 )
+		throw Address::BadFamily() ;
+	else if( Address4::af() && addr->sa_family == Address4::af() )
+		m_ipv4 = std::make_unique<Address4>( addr , len , ipv6_scope_id_fixup ) ;
+	else if( Address6::af() && addr->sa_family == Address6::af() )
+		m_ipv6 = std::make_unique<Address6>( addr , len , ipv6_scope_id_fixup ) ;
+	else if( AddressLocal::af() && addr->sa_family == AddressLocal::af() )
+		m_local = std::make_unique<AddressLocal>( addr , len , ipv6_scope_id_fixup ) ;
+	else
+		throw Address::BadFamily() ;
 }
 
-GNet::Address::Address( const std::string & s ) :
-	m_4imp(AddressImp::make_4_if(AddressImp::is4(s),s)) ,
-	m_6imp(AddressImp::make_6_if(!AddressImp::is4(s),s))
+GNet::Address::Address( const std::string & s )
 {
+	std::string r1 , r2 ;
+	if( s.empty() )
+		throw Address::Error( "empty string" ) ;
+	else if( AddressLocal::af() && isFamilyLocal(s) )
+		m_local = std::make_unique<AddressLocal>( s ) ;
+	else if( Address4::af() && Address4::validString(s,&r1) )
+		m_ipv4 = std::make_unique<Address4>( s ) ;
+	else if( Address6::af() && Address6::validString(s,&r2) )
+		m_ipv6 = std::make_unique<Address6>( s ) ;
+	else
+		throw Address::Error( r1 , r1==r2?std::string():r2 , G::Str::printable(s) ) ;
 }
 
-GNet::Address::Address( const std::string & s , unsigned int port ) :
-	m_4imp(AddressImp::make_4_if(AddressImp::is4(s,port),s,port)) ,
-	m_6imp(AddressImp::make_6_if(!AddressImp::is4(s,port),s,port))
+GNet::Address::Address( const std::string & s , NotLocal )
 {
+	std::string r1 , r2 ;
+	if( s.empty() )
+		throw Address::Error( "empty string" ) ;
+	else if( Address4::af() && Address4::validString(s,&r1) )
+		m_ipv4 = std::make_unique<Address4>( s ) ;
+	else if( Address6::af() && Address6::validString(s,&r2) )
+		m_ipv6 = std::make_unique<Address6>( s ) ;
+	else
+		throw Address::Error( r1 , r1==r2?std::string():r2 , G::Str::printable(s) ) ;
 }
 
-GNet::Address::Address( Family f , unsigned int port , int loopback_overload ) :
-	m_4imp(AddressImp::make_4_if(f==Family::ipv4,port,loopback_overload)) ,
-	m_6imp(AddressImp::make_6_if(f!=Family::ipv4,port,loopback_overload))
+GNet::Address::Address( const std::string & host_part , const std::string & port_part )
 {
+	std::string r1 , r2 ;
+	if( host_part.empty() )
+		throw Address::Error( "empty string" ) ;
+	else if( AddressLocal::af() && isFamilyLocal( host_part ) )
+		m_local = std::make_unique<AddressLocal>( host_part , port_part ) ;
+	else if( Address4::af() && Address4::validStrings(host_part,port_part,&r1) )
+		m_ipv4 = std::make_unique<Address4>( host_part , port_part ) ;
+	else if( Address6::af() && Address6::validStrings(host_part,port_part,&r2) )
+		m_ipv6 = std::make_unique<Address6>( host_part , port_part ) ;
+	else
+		throw Address::Error( r1 , r1==r2?std::string():r2 , G::Str::printable(host_part) + " " + G::Str::printable(port_part) ) ;
+}
+
+GNet::Address::Address( const std::string & host_part , unsigned int port )
+{
+	std::string r1 , r2 ;
+	if( host_part.empty() )
+		throw Address::Error( "empty string" ) ;
+	else if( AddressLocal::af() && isFamilyLocal( host_part ) )
+		m_local = std::make_unique<AddressLocal>( host_part , port ) ;
+	else if( Address4::af() && Address4::validStrings(host_part,"0",&r1) && Address4::validPort(port) )
+		m_ipv4 = std::make_unique<Address4>( host_part , port ) ;
+	else if( Address6::af() && Address6::validStrings(host_part,"0",&r2) && Address6::validPort(port) )
+		m_ipv6 = std::make_unique<Address6>( host_part , port ) ;
+	else
+		throw Address::Error( r1 , r1==r2?std::string():r2 , G::Str::printable(host_part) ) ;
+}
+
+GNet::Address::Address( Family f , unsigned int port , int loopback_overload )
+{
+	if( Address4::af() && f == Address::Family::ipv4 )
+		m_ipv4 = std::make_unique<Address4>( port , loopback_overload ) ;
+	else if( Address6::af() && f == Address::Family::ipv6 )
+		m_ipv6 = std::make_unique<Address6>( port , loopback_overload ) ;
+	else if( AddressLocal::af() && f == Address::Family::local )
+		m_local = std::make_unique<AddressLocal>( port , loopback_overload ) ;
+	else
+		throw Address::BadFamily() ;
 }
 
 GNet::Address::Address( const Address & other )
 {
-	if( other.m_4imp ) m_4imp = std::make_unique<Address4>( *other.m_4imp ) ;
-	if( other.m_6imp ) m_6imp = std::make_unique<Address6>( *other.m_6imp ) ;
+	G_ASSERT( other.m_ipv4 || other.m_ipv6 || other.m_local ) ;
+	if( other.m_ipv4 )
+		m_ipv4 = std::make_unique<Address4>( *other.m_ipv4 ) ;
+	if( other.m_ipv6 )
+		m_ipv6 = std::make_unique<Address6>( *other.m_ipv6 ) ;
+	if( other.m_local )
+		m_local = std::make_unique<AddressLocal>( *other.m_local ) ;
 }
 
 GNet::Address::Address( Address && other ) noexcept
@@ -131,8 +196,9 @@ GNet::Address::~Address()
 void GNet::Address::swap( Address & other ) noexcept
 {
 	using std::swap ;
-	swap( m_4imp , other.m_4imp ) ;
-	swap( m_6imp , other.m_6imp ) ;
+	swap( m_ipv4 , other.m_ipv4 ) ;
+	swap( m_ipv6 , other.m_ipv6 ) ;
+	swap( m_local , other.m_local ) ;
 }
 
 GNet::Address & GNet::Address::operator=( const Address & other )
@@ -144,90 +210,148 @@ GNet::Address & GNet::Address::operator=( const Address & other )
 GNet::Address & GNet::Address::operator=( Address && other ) noexcept
 = default ;
 
+GNet::Address GNet::Address::parse( const std::string & s )
+{
+	return Address( s ) ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & s , Address::NotLocal not_local )
+{
+	return { s , not_local } ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & host_part , unsigned int port )
+{
+	return { host_part , port } ;
+}
+
+GNet::Address GNet::Address::parse( const std::string & host_part , const std::string & port_part )
+{
+	return { host_part , port_part } ;
+}
+
+bool GNet::Address::isFamilyLocal( const std::string & s )
+{
+	return supports( Family::local ) && !s.empty() && s[0] == '/' ;
+}
+
+GNet::Address GNet::Address::defaultAddress()
+{
+	return { Family::ipv4 , 0U } ;
+}
+
 GNet::Address GNet::Address::loopback( Family f , unsigned int port )
 {
-	return Address( f , port , 1 ) ;
+	return { f , port , 1 } ;
 }
 
 GNet::Address & GNet::Address::setPort( unsigned int port )
 {
-	m_4imp ? m_4imp->setPort(port) : m_6imp->setPort(port) ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) m_ipv4->setPort( port ) ;
+	if( m_ipv6 ) m_ipv6->setPort( port ) ;
+	if( m_local ) m_local->setPort( port ) ;
 	return *this ;
 }
 
-bool GNet::Address::setZone( const std::string & zone )
+bool GNet::Address::setZone( const std::string & ipv6_zone )
 {
-	return m_4imp ? true : m_6imp->setZone(zone) ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) m_ipv4->setZone( ipv6_zone ) ;
+	if( m_ipv6 ) m_ipv6->setZone( ipv6_zone ) ;
+	if( m_local ) m_local->setZone( ipv6_zone ) ;
+	return true ;
 }
 
-GNet::Address & GNet::Address::setScopeId( unsigned long scope_id )
+GNet::Address & GNet::Address::setScopeId( unsigned long ipv6_scope_id )
 {
-	if( m_6imp ) m_6imp->setScopeId(scope_id) ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) m_ipv4->setScopeId( ipv6_scope_id ) ;
+	if( m_ipv6 ) m_ipv6->setScopeId( ipv6_scope_id ) ;
+	if( m_local ) m_local->setScopeId( ipv6_scope_id ) ;
 	return *this ;
 }
 
 unsigned int GNet::Address::bits() const
 {
-	return m_4imp ? m_4imp->bits() : m_6imp->bits() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->bits() ;
+	if( m_ipv6 ) return m_ipv6->bits() ;
+	if( m_local ) return m_local->bits() ;
+	return 0U ;
 }
 
 bool GNet::Address::isLoopback() const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && m_4imp->isLoopback() ) ||
-		( m_6imp && m_6imp->isLoopback() ) ;
+		( m_ipv4 && m_ipv4->isLoopback() ) ||
+		( m_ipv6 && m_ipv6->isLoopback() ) ||
+		( m_local && m_local->isLoopback() ) ;
 }
 
 bool GNet::Address::isLocal( std::string & reason ) const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && m_4imp->isLocal(reason) ) ||
-		( m_6imp && m_6imp->isLocal(reason) ) ;
+		( m_ipv4 && m_ipv4->isLocal(reason) ) ||
+		( m_ipv6 && m_ipv6->isLocal(reason) ) ||
+		( m_local && m_local->isLocal(reason) ) ;
 }
 
 bool GNet::Address::isLinkLocal() const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && m_4imp->isLinkLocal() ) ||
-		( m_6imp && m_6imp->isLinkLocal() ) ;
+		( m_ipv4 && m_ipv4->isLinkLocal() ) ||
+		( m_ipv6 && m_ipv6->isLinkLocal() ) ||
+		( m_local && m_local->isLinkLocal() ) ;
 }
 
 bool GNet::Address::isUniqueLocal() const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && m_4imp->isUniqueLocal() ) ||
-		( m_6imp && m_6imp->isUniqueLocal() ) ;
+		( m_ipv4 && m_ipv4->isUniqueLocal() ) ||
+		( m_ipv6 && m_ipv6->isUniqueLocal() ) ||
+		( m_local && m_local->isUniqueLocal() ) ;
 }
 
 bool GNet::Address::isAny() const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && m_4imp->isAny() ) ||
-		( m_6imp && m_6imp->isAny() ) ;
+		( m_ipv4 && m_ipv4->isAny() ) ||
+		( m_ipv6 && m_ipv6->isAny() ) ||
+		( m_local && m_local->isAny() ) ;
 }
 
 bool GNet::Address::is4() const
 {
-	return !!m_4imp ;
+	return !!m_ipv4 ;
 }
 
 bool GNet::Address::is6() const
 {
-	return !!m_6imp ;
+	return !!m_ipv6 ;
 }
 
-bool GNet::Address::same( const Address & other , bool with_scope ) const
+bool GNet::Address::same( const Address & other , bool ipv6_compare_with_scope ) const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && other.m_4imp && m_4imp->same(*other.m_4imp) ) ||
-		( m_6imp && other.m_6imp && m_6imp->same(*other.m_6imp,with_scope) ) ;
+		( m_ipv4 && other.m_ipv4 && m_ipv4->same(*other.m_ipv4,ipv6_compare_with_scope) ) ||
+		( m_ipv6 && other.m_ipv6 && m_ipv6->same(*other.m_ipv6,ipv6_compare_with_scope) ) ||
+		( m_local && other.m_local && m_local->same(*other.m_local,ipv6_compare_with_scope) ) ;
 }
 
 bool GNet::Address::operator==( const Address & other ) const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && other.m_4imp && m_4imp->same(*other.m_4imp) ) ||
-		( m_6imp && other.m_6imp && m_6imp->same(*other.m_6imp) ) ;
+		( m_ipv4 && other.m_ipv4 && m_ipv4->same(*other.m_ipv4) ) ||
+		( m_ipv6 && other.m_ipv6 && m_ipv6->same(*other.m_ipv6) ) ||
+		( m_local && other.m_local && m_local->same(*other.m_local) ) ;
 }
 
 bool GNet::Address::operator!=( const Address & other ) const
@@ -237,62 +361,106 @@ bool GNet::Address::operator!=( const Address & other ) const
 
 bool GNet::Address::sameHostPart( const Address & other ) const
 {
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
 	return
-		( m_4imp && other.m_4imp && m_4imp->sameHostPart(*other.m_4imp) ) ||
-		( m_6imp && other.m_6imp && m_6imp->sameHostPart(*other.m_6imp) ) ;
+		( m_ipv4 && other.m_ipv4 && m_ipv4->sameHostPart(*other.m_ipv4) ) ||
+		( m_ipv6 && other.m_ipv6 && m_ipv6->sameHostPart(*other.m_ipv6) ) ||
+		( m_local && other.m_local && m_local->sameHostPart(*other.m_local) ) ;
 }
 
-std::string GNet::Address::displayString( bool with_scope_id ) const
+std::string GNet::Address::displayString( bool ipv6_with_scope_id ) const
 {
-	G_ASSERT( m_4imp || m_6imp ) ;
-	return m_4imp ? m_4imp->displayString() : m_6imp->displayString(with_scope_id) ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->displayString( ipv6_with_scope_id ) ;
+	if( m_ipv6 ) return m_ipv6->displayString( ipv6_with_scope_id ) ;
+	if( m_local ) return m_local->displayString( ipv6_with_scope_id ) ;
+	return {} ;
 }
 
-std::string GNet::Address::hostPartString() const
+std::string GNet::Address::hostPartString( bool raw ) const
 {
-	G_ASSERT( m_4imp || m_6imp ) ;
-	return m_4imp ? m_4imp->hostPartString() : m_6imp->hostPartString() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->hostPartString( raw ) ;
+	if( m_ipv6 ) return m_ipv6->hostPartString( raw ) ;
+	if( m_local ) return m_local->hostPartString( raw ) ;
+	return {} ;
 }
 
 std::string GNet::Address::queryString() const
 {
-	G_ASSERT( m_4imp || m_6imp ) ;
-	return m_4imp ? m_4imp->queryString() : m_6imp->queryString() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->queryString() ;
+	if( m_ipv6 ) return m_ipv6->queryString() ;
+	if( m_local ) return m_local->queryString() ;
+	return {} ;
 }
 
 bool GNet::Address::validString( const std::string & s , std::string * reason_p )
 {
-	return Address4::validString( s , reason_p ) || Address6::validString( s , reason_p ) ;
+	return
+		Address4::validString( s , reason_p ) ||
+		Address6::validString( s , reason_p ) ||
+		AddressLocal::validString( s , reason_p ) ;
+}
+
+bool GNet::Address::validString( const std::string & s , NotLocal , std::string * reason_p )
+{
+	return
+		Address4::validString( s , reason_p ) ||
+		Address6::validString( s , reason_p ) ;
 }
 
 bool GNet::Address::validStrings( const std::string & s1 , const std::string & s2 , std::string * reason_p )
 {
-	return Address4::validStrings( s1 , s2 , reason_p ) || Address6::validStrings( s1 , s2 , reason_p ) ;
+	return
+		Address4::validStrings( s1 , s2 , reason_p ) ||
+		Address6::validStrings( s1 , s2 , reason_p ) ||
+		AddressLocal::validStrings( s1 , s2 , reason_p ) ;
 }
 
 sockaddr * GNet::Address::address()
 {
-	return m_4imp ? m_4imp->address() : m_6imp->address() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->address() ;
+	if( m_ipv6 ) return m_ipv6->address() ;
+	if( m_local ) return m_local->address() ;
+	return nullptr ;
 }
 
 const sockaddr * GNet::Address::address() const
 {
-	return m_4imp ? m_4imp->address() : m_6imp->address() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->address() ;
+	if( m_ipv6 ) return m_ipv6->address() ;
+	if( m_local ) return m_local->address() ;
+	return nullptr ;
 }
 
 socklen_t GNet::Address::length() const
 {
-	return m_4imp ? Address4::length() : Address6::length() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->length() ;
+	if( m_ipv6 ) return m_ipv6->length() ;
+	if( m_local ) return m_local->length() ;
+	return 0 ;
 }
 
 unsigned int GNet::Address::port() const
 {
-	return m_4imp ? m_4imp->port() : m_6imp->port() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->port() ;
+	if( m_ipv6 ) return m_ipv6->port() ;
+	if( m_local ) return m_local->port() ;
+	return 0 ;
 }
 
 unsigned long GNet::Address::scopeId( unsigned long default_ ) const
 {
-	return m_4imp ? default_ : m_6imp->scopeId() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->scopeId( default_ ) ;
+	if( m_ipv6 ) return m_ipv6->scopeId( default_ ) ;
+	if( m_local ) return m_local->scopeId( default_ ) ;
+	return default_ ;
 }
 
 bool GNet::Address::validPort( unsigned int port )
@@ -302,27 +470,45 @@ bool GNet::Address::validPort( unsigned int port )
 
 bool GNet::Address::validData( const sockaddr * addr , socklen_t len )
 {
-	return Address4::validData( addr , len ) || Address6::validData( addr , len ) ;
+	return
+		Address4::validData( addr , len ) ||
+		Address6::validData( addr , len ) ||
+		AddressLocal::validData( addr , len ) ;
 }
 
-int GNet::Address::domain() const
+int GNet::Address::domain( Family family )
 {
-	return m_4imp ? Address4::domain() : Address6::domain() ;
+	if( family == Family::ipv4 ) return Address4::domain() ;
+	if( family == Family::ipv6 ) return Address6::domain() ;
+	if( family == Family::local ) return AddressLocal::domain() ;
+	return 0 ;
 }
 
 GNet::Address::Family GNet::Address::family() const
 {
-	return m_4imp ? Family::ipv4 : Family::ipv6 ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return Family::ipv4 ;
+	if( m_ipv6 ) return Family::ipv6 ;
+	if( m_local ) return Family::local ;
+	return Family::ipv4 ;
 }
 
 int GNet::Address::af() const
 {
-	return m_4imp ? AF_INET : AF_INET6 ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return Address4::af() ;
+	if( m_ipv6 ) return Address6::af() ;
+	if( m_local ) return AddressLocal::af() ;
+	return 0 ;
 }
 
 G::StringArray GNet::Address::wildcards() const
 {
-	return m_4imp ? m_4imp->wildcards() : m_6imp->wildcards() ;
+	G_ASSERT( m_ipv4 || m_ipv6 || m_local ) ;
+	if( m_ipv4 ) return m_ipv4->wildcards() ;
+	if( m_ipv6 ) return m_ipv6->wildcards() ;
+	if( m_local ) return m_local->wildcards() ;
+	return {} ;
 }
 
 // ===
@@ -333,7 +519,7 @@ G::StringArray GNet::Address::wildcards() const
 class GNet::AddressStorageImp
 {
 public:
-	Address6::storage_type u ;
+	sockaddr_storage u ;
 	socklen_t n ;
 } ;
 
@@ -342,11 +528,15 @@ public:
 GNet::AddressStorage::AddressStorage() :
 	m_imp(std::make_unique<AddressStorageImp>())
 {
-	static_assert( sizeof(Address4::storage_type) <= sizeof(Address6::storage_type) , "" ) ;
-	static_assert( sizeof(Address6::sockaddr_type) <= sizeof(Address6::storage_type) , "" ) ;
-	static_assert( alignof(Address4::sockaddr_type) <= alignof(Address6::storage_type) , "" ) ;
-	static_assert( alignof(Address6::sockaddr_type) <= alignof(Address6::storage_type) , "" ) ;
-	m_imp->n = sizeof( Address6::storage_type ) ;
+	static_assert( sizeof(Address4::sockaddr_type) <= sizeof(sockaddr_storage) , "" ) ;
+	static_assert( sizeof(Address6::sockaddr_type) <= sizeof(sockaddr_storage) , "" ) ;
+	static_assert( sizeof(AddressLocal::sockaddr_type) <= sizeof(sockaddr_storage) , "" ) ;
+
+	static_assert( alignof(Address4::sockaddr_type) <= alignof(sockaddr_storage) , "" ) ;
+	static_assert( alignof(Address6::sockaddr_type) <= alignof(sockaddr_storage) , "" ) ;
+	static_assert( alignof(AddressLocal::sockaddr_type) <= alignof(sockaddr_storage) , "" ) ;
+
+	m_imp->n = sizeof( sockaddr_storage ) ;
 }
 
 GNet::AddressStorage::~AddressStorage()
diff --git a/src/gnet/gaddresslocal.h b/src/gnet/gaddresslocal.h
new file mode 100644
index 0000000..9dcbcfa
--- /dev/null
+++ b/src/gnet/gaddresslocal.h
@@ -0,0 +1,104 @@
+//
+// Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// ===
+///
+/// \file gaddresslocal.h
+///
+
+#ifndef G_NET_ADDRESSLOCAL_H
+#define G_NET_ADDRESSLOCAL_H
+
+#include "gdef.h"
+#include "gaddress.h"
+#include "gstrings.h"
+#include <string>
+#if GCONFIG_HAVE_UDS
+#include <sys/types.h>
+#include <sys/un.h>
+#else
+#ifdef G_DOXYGEN
+struct sockaddr_un ;
+#else
+struct sockaddr_un {} ;
+#endif
+#endif
+
+namespace GNet
+{
+	class AddressLocal ;
+}
+
+//| \class GNet::AddressLocal
+/// A 'sockaddr' wrapper class for local-domain addresses.
+///
+/// Use "netcat -U" or "socat" to connect to local-domain
+/// sockets, eg:
+/// \code
+/// $ nc -U -C /run/cmd.s
+/// $ socat -d tcp-listen:8080,fork unix:/run/cmd.s
+/// \endcode
+///
+class GNet::AddressLocal
+{
+public:
+	using sockaddr_type = sockaddr_un ;
+
+	explicit AddressLocal( unsigned int ) ;
+	explicit AddressLocal( const std::string & ) ;
+	AddressLocal( const std::string & , const std::string & ) ;
+	AddressLocal( const std::string & , unsigned int ) ;
+	AddressLocal( unsigned int port , int /*for overload resolution*/ ) ;
+	AddressLocal( const sockaddr * addr , socklen_t len , bool ipv6_scope_id_fixup = false ) ;
+
+	static int domain() noexcept ;
+	static unsigned short af() noexcept ;
+	const sockaddr * address() const ;
+	sockaddr * address() ;
+	socklen_t length() const noexcept ;
+	unsigned long scopeId( unsigned long default_ = 0UL ) const ;
+	unsigned int port() const ;
+	void setPort( unsigned int port ) ;
+	bool setZone( const std::string & ipv6_zone_name_or_scope_id ) ;
+	void setScopeId( unsigned long ipv6_scope_id ) ;
+	static bool validString( const std::string & , std::string * = nullptr ) ;
+	static bool validStrings( const std::string & , const std::string & , std::string * = nullptr ) ;
+	static bool validPort( unsigned int port ) ;
+	static bool validData( const sockaddr * addr , socklen_t len ) ;
+
+	bool same( const AddressLocal & other , bool ipv6_compare_with_scope = false ) const ;
+	bool sameHostPart( const AddressLocal & other ) const ;
+	bool isLoopback() const ;
+	bool isLocal( std::string & ) const ;
+	bool isLinkLocal() const ;
+	bool isUniqueLocal() const ;
+	bool isAny() const ;
+	unsigned int bits() const ;
+	std::string displayString( bool ipv6_with_scope = false ) const ;
+	std::string hostPartString( bool raw = false ) const ;
+	std::string queryString() const ;
+	G::StringArray wildcards() const ;
+	static bool format( const std::string & ) ;
+
+private:
+	explicit AddressLocal( std::nullptr_t ) ;
+	std::string path() const ;
+
+private:
+	sockaddr_type m_local ;
+	std::size_t m_size ;
+} ;
+
+#endif
diff --git a/src/gnet/gaddresslocal_none.cpp b/src/gnet/gaddresslocal_none.cpp
new file mode 100644
index 0000000..26115ca
--- /dev/null
+++ b/src/gnet/gaddresslocal_none.cpp
@@ -0,0 +1,200 @@
+//
+// Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// ===
+///
+/// \file gaddresslocal_none.cpp
+///
+
+#include "gdef.h"
+#include "gaddresslocal.h"
+
+unsigned short GNet::AddressLocal::af() noexcept
+{
+	return 0 ;
+}
+
+int GNet::AddressLocal::domain() noexcept
+{
+	return 0 ;
+}
+
+GNet::AddressLocal::AddressLocal( std::nullptr_t ) :
+	m_local{} ,
+	m_size(0U)
+{
+}
+
+GNet::AddressLocal::AddressLocal( unsigned int /*port*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( unsigned int /*port*/ , int /*loopback_overload*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const sockaddr * /*addr*/ , socklen_t /*len*/ , bool /*ipv6_scope_id_fixup*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & /*host_part*/ , unsigned int /*port*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & /*host_part*/ , const std::string & /*port_part*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & /*display_string*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+void GNet::AddressLocal::setPort( unsigned int /*port*/ )
+{
+}
+
+bool GNet::AddressLocal::setZone( const std::string & /*ipv6_zone_name_or_scope_id*/ )
+{
+	return true ;
+}
+
+void GNet::AddressLocal::setScopeId( unsigned long /*ipv6_scope_id*/ )
+{
+}
+
+std::string GNet::AddressLocal::path() const
+{
+	return std::string() ;
+}
+
+std::string GNet::AddressLocal::displayString( bool /*ipv6_with_scope*/ ) const
+{
+	return path() ;
+}
+
+std::string GNet::AddressLocal::hostPartString( bool /*raw*/ ) const
+{
+	return displayString() ;
+}
+
+std::string GNet::AddressLocal::queryString() const
+{
+	return std::string() ;
+}
+
+bool GNet::AddressLocal::validData( const sockaddr * /*addr*/ , socklen_t /*len*/ )
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::validString( const std::string & /*path*/ , std::string * reason_p )
+{
+	if( reason_p )
+		*reason_p = "not implemented" ;
+	return false ;
+}
+
+bool GNet::AddressLocal::validStrings( const std::string & /*host_part*/ , const std::string & /*port_part*/ ,
+	std::string * reason_p )
+{
+	return validString( std::string() , reason_p ) ;
+}
+
+bool GNet::AddressLocal::validPort( unsigned int /*port*/ )
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::same( const AddressLocal & /*other*/ , bool /*ipv6_compare_with_scope*/ ) const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::sameHostPart( const AddressLocal & /*other*/ ) const
+{
+	return false ;
+}
+
+unsigned int GNet::AddressLocal::port() const
+{
+	return 0U ;
+}
+
+unsigned long GNet::AddressLocal::scopeId( unsigned long default_ ) const
+{
+	return default_ ;
+}
+
+const sockaddr * GNet::AddressLocal::address() const
+{
+	return nullptr ;
+}
+
+sockaddr * GNet::AddressLocal::address()
+{
+	return nullptr ;
+}
+
+socklen_t GNet::AddressLocal::length() const noexcept
+{
+	return 0 ;
+}
+
+G::StringArray GNet::AddressLocal::wildcards() const
+{
+	return {} ;
+}
+
+bool GNet::AddressLocal::format( const std::string & )
+{
+	return true ;
+}
+
+bool GNet::AddressLocal::isLocal( std::string & ) const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isLoopback() const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isLinkLocal() const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isUniqueLocal() const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isAny() const
+{
+	return false ;
+}
+
+unsigned int GNet::AddressLocal::bits() const
+{
+	return 0U ;
+}
+
diff --git a/src/gnet/gaddresslocal_unix.cpp b/src/gnet/gaddresslocal_unix.cpp
new file mode 100644
index 0000000..9fe42aa
--- /dev/null
+++ b/src/gnet/gaddresslocal_unix.cpp
@@ -0,0 +1,269 @@
+//
+// Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// ===
+///
+/// \file gaddresslocal_unix.cpp
+///
+
+#include "gdef.h"
+#include "gaddresslocal.h"
+#include "gstr.h"
+#include "gassert.h"
+#include <cstddef> // offsetof
+#include <cstring> // std::memcpy()
+#include <sys/types.h>
+#include <sys/un.h>
+
+namespace GNet
+{
+	namespace AddressLocalImp
+	{
+		static constexpr std::size_t minsize()
+		{
+			return sizeof( sockaddr_un::sun_family ) ;
+		}
+		static constexpr std::size_t psize()
+		{
+			return sizeof( sockaddr_un::sun_path ) ;
+		}
+		static std::size_t poffset() noexcept
+		{
+			return offsetof( sockaddr_un , sun_path ) ;
+		}
+		std::string unescape( std::string path )
+		{
+			if( path.size() > 1U && path[0U] == '\\' && path[1U] == '0' )
+			{
+				path = path.substr( 1U ) ;
+				path[0] = '\0' ;
+			}
+			return path ;
+		}
+	}
+}
+
+unsigned short GNet::AddressLocal::af() noexcept
+{
+	return AF_UNIX ;
+}
+
+int GNet::AddressLocal::domain() noexcept
+{
+	return PF_UNIX ;
+}
+
+GNet::AddressLocal::AddressLocal( std::nullptr_t ) :
+	m_local{} ,
+	m_size(AddressLocalImp::minsize())
+{
+	m_local.sun_family = af() ;
+	std::memset( m_local.sun_path , 0 , AddressLocalImp::psize() ) ;
+}
+
+GNet::AddressLocal::AddressLocal( unsigned int /*port*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( unsigned int /*port*/ , int /*loopback_overload*/ ) :
+	AddressLocal(nullptr)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const sockaddr * addr , socklen_t len , bool /*ipv6_scope_id_fixup*/ ) :
+	AddressLocal(nullptr)
+{
+	std::size_t size = static_cast<std::size_t>( len ) ;
+
+	if( addr == nullptr )
+		throw Address::Error() ;
+	if( addr->sa_family != af() || size > sizeof(sockaddr_type) )
+		throw Address::BadFamily() ;
+
+	m_local = *(reinterpret_cast<const sockaddr_type*>(addr)) ;
+	m_size = size ;
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & host_part , unsigned int /*port*/ ) :
+	AddressLocal(nullptr)
+{
+	if( host_part.size() >= AddressLocalImp::psize() )
+		throw Address::BadString( "local-domain address too long" ) ;
+	std::memcpy( m_local.sun_path , host_part.data() , host_part.size() ) ;
+	m_size = AddressLocalImp::poffset() + host_part.size() + 1U ; // include terminator
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & host_part , const std::string & /*port_part*/ ) :
+	AddressLocal(host_part,0)
+{
+}
+
+GNet::AddressLocal::AddressLocal( const std::string & display_string ) :
+	AddressLocal(AddressLocalImp::unescape(display_string),0)
+{
+}
+
+void GNet::AddressLocal::setPort( unsigned int /*port*/ )
+{
+}
+
+bool GNet::AddressLocal::setZone( const std::string & /*ipv6_zone_name_or_scope_id*/ )
+{
+	return true ;
+}
+
+void GNet::AddressLocal::setScopeId( unsigned long /*ipv6_scope_id*/ )
+{
+}
+
+std::string GNet::AddressLocal::path() const
+{
+	namespace imp = AddressLocalImp ;
+	G_ASSERT( m_size >= imp::minsize() ) ;
+	if( m_size <= imp::poffset() )
+		return {} ;
+	else if( m_local.sun_path[0] == '\0' ) // if abstract
+		return { m_local.sun_path , std::min(m_size-imp::poffset(),imp::psize()) } ;
+	else
+		return { m_local.sun_path , std::min(std::strlen(m_local.sun_path),imp::psize()) } ;
+
+}
+
+std::string GNet::AddressLocal::displayString( bool /*ipv6_with_scope*/ ) const
+{
+	std::string p = path() ;
+	return p.empty() ? std::string(1U,'/') : G::Str::printable( p ) ;
+}
+
+std::string GNet::AddressLocal::hostPartString( bool raw ) const
+{
+	return raw ? path() : G::Str::printable(path()) ;
+}
+
+std::string GNet::AddressLocal::queryString() const
+{
+	return {} ;
+}
+
+bool GNet::AddressLocal::validData( const sockaddr * addr , socklen_t len )
+{
+	return addr != nullptr && addr->sa_family == af() && len >= AddressLocalImp::minsize() && len <= sizeof(sockaddr_type) ;
+}
+
+bool GNet::AddressLocal::validString( const std::string & path , std::string * reason_p )
+{
+	const char * reason = nullptr ;
+	if( path.size() > AddressLocalImp::psize() )
+		reason = "local-domain address too long" ;
+	if( path.empty() )
+		reason = "empty string" ;
+	if( path[0] != '\0' && path[0] != '/' )
+		reason = "not an absolute filesystem path" ;
+	if( reason && reason_p )
+		*reason_p = std::string( reason ) ;
+	return reason == nullptr ;
+}
+
+bool GNet::AddressLocal::validStrings( const std::string & host_part , const std::string & /*port_part*/ ,
+	std::string * reason_p )
+{
+	return validString( host_part , reason_p ) ;
+}
+
+bool GNet::AddressLocal::validPort( unsigned int /*port*/ )
+{
+	return true ;
+}
+
+bool GNet::AddressLocal::same( const AddressLocal & other , bool /*ipv6_compare_with_scope*/ ) const
+{
+	G_ASSERT( m_local.sun_family == af() ) ;
+	return
+		m_local.sun_family == other.m_local.sun_family &&
+		m_size == other.m_size &&
+		path() == other.path() ;
+}
+
+bool GNet::AddressLocal::sameHostPart( const AddressLocal & other ) const
+{
+	return same( other ) ;
+}
+
+unsigned int GNet::AddressLocal::port() const
+{
+	return 0U ;
+}
+
+unsigned long GNet::AddressLocal::scopeId( unsigned long default_ ) const
+{
+	return default_ ;
+}
+
+const sockaddr * GNet::AddressLocal::address() const
+{
+	return reinterpret_cast<const sockaddr*>(&m_local) ;
+}
+
+sockaddr * GNet::AddressLocal::address()
+{
+	return reinterpret_cast<sockaddr*>(&m_local) ;
+}
+
+socklen_t GNet::AddressLocal::length() const noexcept
+{
+	return m_size ;
+}
+
+G::StringArray GNet::AddressLocal::wildcards() const
+{
+	return { displayString() } ;
+}
+
+bool GNet::AddressLocal::format( const std::string & )
+{
+	return true ;
+}
+
+bool GNet::AddressLocal::isLocal( std::string & ) const
+{
+	return true ;
+}
+
+bool GNet::AddressLocal::isLoopback() const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isLinkLocal() const
+{
+	return false ;
+}
+
+bool GNet::AddressLocal::isUniqueLocal() const
+{
+	return true ;
+}
+
+bool GNet::AddressLocal::isAny() const
+{
+	return path().empty() ;
+}
+
+unsigned int GNet::AddressLocal::bits() const
+{
+	return 0U ;
+}
+
diff --git a/src/gnet/gclient.cpp b/src/gnet/gclient.cpp
index 06d292d..c758fef 100644
--- a/src/gnet/gclient.cpp
+++ b/src/gnet/gclient.cpp
@@ -30,6 +30,7 @@
 #include "gassert.h"
 #include "gtest.h"
 #include "glog.h"
+#include <numeric> // std::accumulate
 #include <sstream>
 #include <cstdlib>
 
@@ -178,7 +179,7 @@ void GNet::Client::startConnecting()
 	// create and open a socket
 	//
 	m_sp.reset() ;
-	m_socket = std::make_unique<StreamSocket>( m_remote_location.address().domain() ) ;
+	m_socket = std::make_unique<StreamSocket>( m_remote_location.address().family() ) ;
 	socket().addWriteHandler( *this , m_es ) ;
 
 	// create a socket protocol object
@@ -280,6 +281,7 @@ void GNet::Client::writeEvent()
 
 void GNet::Client::onWriteable()
 {
+	bool has_peer = m_state == State::Connecting && socket().getPeerAddress().first ;
 	if( m_state == State::Connected )
 	{
 		if( m_sp->writeEvent() )
@@ -291,7 +293,7 @@ void GNet::Client::onWriteable()
 		setState( State::Connecting ) ;
 		m_connected_timer.startTimer( 2U , 100000U ) ; // -> onConnectedTimeout()
 	}
-	else if( m_state == State::Connecting && socket().hasPeer() && m_remote_location.socks() )
+	else if( m_state == State::Connecting && has_peer && m_remote_location.socks() )
 	{
 		setState( State::Socksing ) ;
 		m_socks = std::make_unique<Socks>( m_remote_location ) ;
@@ -308,7 +310,7 @@ void GNet::Client::onWriteable()
 			socket().dropReadHandler() ;
 		}
 	}
-	else if( m_state == State::Connecting && socket().hasPeer() )
+	else if( m_state == State::Connecting && has_peer )
 	{
 		socket().dropWriteHandler() ;
 		socket().addReadHandler( *this , m_es ) ;
@@ -432,7 +434,7 @@ std::pair<bool,GNet::Address> GNet::Client::localAddress() const
 {
 	return
 		m_socket != nullptr ?
-			socket().getLocalAddress() :
+			std::make_pair(true,socket().getLocalAddress()) :
 			std::make_pair(false,GNet::Address::defaultAddress()) ;
 }
 
@@ -478,7 +480,9 @@ bool GNet::Client::send( const std::string & data , std::size_t offset )
 
 bool GNet::Client::send( const std::vector<G::string_view> & data , std::size_t offset )
 {
-	if( m_response_timeout && data.size() > offset )
+	std::size_t total_size = std::accumulate( data.begin() , data.end() , std::size_t(0U) ,
+		[](std::size_t n,G::string_view s){return n+s.size();} ) ;
+	if( m_response_timeout && offset < total_size )
 		m_response_timer.startTimer( m_response_timeout ) ;
 	return m_sp->send( data , offset ) ;
 }
diff --git a/src/gnet/gdnsblock.cpp b/src/gnet/gdnsblock.cpp
index 2b4b246..e6ac314 100644
--- a/src/gnet/gdnsblock.cpp
+++ b/src/gnet/gdnsblock.cpp
@@ -121,7 +121,7 @@ void GNet::DnsBlock::configureImp( const std::string & config , DnsBlock * p )
 	if( list.size() < 4U )
 		throw std::runtime_error( "not enough comma-sparated fields" ) ;
 
-	Address dns_server( list.at(0U) ) ;
+	Address dns_server = Address::parse( list.at(0U) , Address::NotLocal() ) ;
 
 	// normally allow on timeout, but deny on timeout if configured value is negative
 	std::size_t threshold = G::Str::toUInt( list.at(2U) ) ;
@@ -167,7 +167,7 @@ void GNet::DnsBlock::start( const Address & address )
 		id_generator = 10 ;
 
 	// create a socket to receive responses
-	m_socket_ptr = std::make_unique<DatagramSocket>( m_dns_server.domain() ) ;
+	m_socket_ptr = std::make_unique<DatagramSocket>( m_dns_server.family() ) ;
 	m_socket_ptr->addReadHandler( *this , m_es ) ;
 
 	// send a DNS query to each configured server
diff --git a/src/gnet/gdnsmessage.cpp b/src/gnet/gdnsmessage.cpp
index 48c7804..827c532 100644
--- a/src/gnet/gdnsmessage.cpp
+++ b/src/gnet/gdnsmessage.cpp
@@ -439,7 +439,7 @@ GNet::Address GNet::DnsMessageRR::address() const
 	{
 		throw DnsMessage::Error( "not an address" ) ;
 	}
-	return Address( ss.str() ) ;
+	return Address::parse( ss.str() , Address::NotLocal() ) ;
 }
 
 // ==
diff --git a/src/gnet/geventloop.h b/src/gnet/geventloop.h
index 8d32298..c590190 100644
--- a/src/gnet/geventloop.h
+++ b/src/gnet/geventloop.h
@@ -28,6 +28,7 @@
 #include "gdescriptor.h"
 #include "gsignalsafe.h"
 #include <list>
+#include <memory>
 #include <string>
 
 namespace GNet
@@ -127,10 +128,6 @@ public:
 		///< list of exception sources.
 		///< See also Socket::dropOtherHandler().
 
-	virtual std::string report() const = 0 ;
-		///< Returns a line of text reporting the status of the event loop.
-		///< Used in debugging and diagnostics.
-
 	virtual void disarm( ExceptionHandler * ) noexcept = 0 ;
 		///< Used to prevent the given interface from being used,
 		///< typically called from the ExceptionHandler
diff --git a/src/gnet/geventloop_epoll.cpp b/src/gnet/geventloop_epoll.cpp
index 8adf7ea..3c09f6c 100644
--- a/src/gnet/geventloop_epoll.cpp
+++ b/src/gnet/geventloop_epoll.cpp
@@ -58,7 +58,6 @@ private: // overrides
 	void dropRead( Descriptor fd ) noexcept override ;
 	void dropWrite( Descriptor fd ) noexcept override ;
 	void dropOther( Descriptor fd ) noexcept override ;
-	std::string report() const override ;
 	void disarm( ExceptionHandler * ) noexcept override ;
 
 public:
@@ -318,11 +317,6 @@ void GNet::EventLoopImp::dropOther( Descriptor ) noexcept
 	// no-op
 }
 
-std::string GNet::EventLoopImp::report() const
-{
-	return std::string() ;
-}
-
 void GNet::EventLoopImp::disarm( ExceptionHandler * p ) noexcept
 {
 	m_read_list.disarm( p ) ;
diff --git a/src/gnet/geventloop_select.cpp b/src/gnet/geventloop_select.cpp
index ae30426..cdff476 100644
--- a/src/gnet/geventloop_select.cpp
+++ b/src/gnet/geventloop_select.cpp
@@ -85,7 +85,6 @@ private: // overrides
 	void dropRead( Descriptor fd ) noexcept override ;
 	void dropWrite( Descriptor fd ) noexcept override ;
 	void dropOther( Descriptor fd ) noexcept override ;
-	std::string report() const override ;
 	void disarm( ExceptionHandler * ) noexcept override ;
 
 public:
@@ -363,8 +362,3 @@ void GNet::EventLoopImp::disarm( ExceptionHandler * p ) noexcept
 	m_other_list.disarm( p ) ;
 }
 
-std::string GNet::EventLoopImp::report() const
-{
-	return std::string() ;
-}
-
diff --git a/src/gnet/geventloop_win32.cpp b/src/gnet/geventloop_win32.cpp
index a6b804d..0fdd66c 100644
--- a/src/gnet/geventloop_win32.cpp
+++ b/src/gnet/geventloop_win32.cpp
@@ -80,7 +80,6 @@ private:
 	void dropRead( Descriptor ) noexcept override ;
 	void dropWrite( Descriptor ) noexcept override ;
 	void dropOther( Descriptor ) noexcept override ;
-	std::string report() const override ;
 
 public:
 	EventLoopImp( const EventLoopImp & ) = delete ;
@@ -412,11 +411,6 @@ void GNet::EventLoopImp::quit( const G::SignalSafe & )
 	// not implemented
 }
 
-std::string GNet::EventLoopImp::report() const
-{
-	return std::string() ;
-}
-
 // ==
 
 GNet::EventLoopImp::Library::Library()
diff --git a/src/gnet/ginterfaces.h b/src/gnet/ginterfaces.h
index 5bd9c93..5e7d9ff 100644
--- a/src/gnet/ginterfaces.h
+++ b/src/gnet/ginterfaces.h
@@ -105,10 +105,14 @@ public:
 			///< found or if found but not up. Does lazy load()ing.
 
 	std::vector<Address> addresses( const G::StringArray & names , unsigned int port ,
-		G::StringArray & used_names , G::StringArray & empty_names ) const ;
+		G::StringArray & used_names , G::StringArray & empty_names ,
+		G::StringArray & bad_names ) const ;
 			///< Treats each name given as an address or interface name and
 			///< returns the total set of addresses. Returns by reference
-			///< lists of interface names with and without addresses.
+			///< (1) names that are, or have, addresses, (2) names that might
+			///< be interfaces with no bound addresses, and (3) the remainder,
+			///< ie. names that are not addresses and cannot be a valid
+			///< interface name.
 
 private: // overrides
 	void readEvent() override ; // GNet::EventHandler
diff --git a/src/gnet/ginterfaces_common.cpp b/src/gnet/ginterfaces_common.cpp
index 2f83bb2..b0ebfb3 100644
--- a/src/gnet/ginterfaces_common.cpp
+++ b/src/gnet/ginterfaces_common.cpp
@@ -98,19 +98,33 @@ std::vector<GNet::Address> GNet::Interfaces::find( const std::string & name_in ,
 }
 
 std::vector<GNet::Address> GNet::Interfaces::addresses( const G::StringArray & names , unsigned int port ,
-	G::StringArray & used_names , G::StringArray & empty_names ) const
+	G::StringArray & used_names , G::StringArray & empty_names , G::StringArray & bad_names ) const
 {
 	AddressList result ;
 	for( const auto & name : names )
 	{
 		if( Address::validStrings(name,G::Str::fromUInt(port)) )
 		{
-			result.push_back( Address(name,port) ) ;
+			result.push_back( Address::parse(name,port) ) ;
 		}
 		else
 		{
+			// 'name' is not an address so treat it as an interface name having
+			// bound addresses -- reject file system paths as 'bad' unless
+			// they are under "/dev" (bsd)
 			AddressList list = find( name , port , true ) ;
-			(list.empty()?empty_names:used_names).push_back( name ) ;
+			if( list.empty() && ( name.empty() || ( name.find('/') != std::string::npos && name.find("/dev/") != 0U ) ) )
+			{
+				bad_names.push_back( name ) ;
+			}
+			else if( list.empty() )
+			{
+				empty_names.push_back( name ) ;
+			}
+			else
+			{
+				used_names.push_back( name ) ;
+			}
 			result.insert( result.end() , list.begin() , list.end() ) ;
 		}
 	}
diff --git a/src/gnet/ginterfaces_none.cpp b/src/gnet/ginterfaces_none.cpp
index 9c8f369..67fac4b 100644
--- a/src/gnet/ginterfaces_none.cpp
+++ b/src/gnet/ginterfaces_none.cpp
@@ -56,11 +56,21 @@ std::vector<GNet::Address> GNet::Interfaces::find( const std::string & , unsigne
 }
 
 std::vector<GNet::Address> GNet::Interfaces::addresses( const G::StringArray & names , unsigned int port ,
-	G::StringArray & , G::StringArray & ) const
+	G::StringArray & used_names , G::StringArray & , G::StringArray & bad_names ) const
 {
 	AddressList result ;
 	for( const auto & name : names )
-		result.push_back( Address(name,port) ) ; // throws if an interface name
+	{
+		if( !Address::validStrings( name , G::Str::fromUInt(port) ) )
+		{
+			bad_names.push_back( name ) ;
+		}
+		else
+		{
+			used_names.push_back( name ) ;
+			result.push_back( Address::parse(name,port) ) ;
+		}
+	}
 	return result ;
 }
 
diff --git a/src/gnet/ginterfaces_unix.cpp b/src/gnet/ginterfaces_unix.cpp
index eb8412a..b1ce9b0 100644
--- a/src/gnet/ginterfaces_unix.cpp
+++ b/src/gnet/ginterfaces_unix.cpp
@@ -183,7 +183,7 @@ GNet::InterfacesNotifierImp::InterfacesNotifierImp( Interfaces * outer , Excepti
 		#endif
 		{
 			G::Root claim_root ;
-			m_socket = std::make_unique<RawSocket>( AF_NETLINK , NETLINK_ROUTE ) ;
+			m_socket = std::make_unique<RawSocket>( AF_NETLINK , SOCK_RAW , NETLINK_ROUTE ) ;
 			int rc = ::bind( m_socket->fd() , &address.generic , sizeof(address.specific) ) ;
 			int e = G::Process::errno_() ;
 			if( rc < 0 )
@@ -251,7 +251,7 @@ GNet::InterfacesNotifierImp::InterfacesNotifierImp( Interfaces * outer , Excepti
 	{
 		{
 			G::Root claim_root ;
-			m_socket = std::make_unique<RawSocket>( PF_ROUTE , AF_UNSPEC ) ;
+			m_socket = std::make_unique<RawSocket>( PF_ROUTE , SOCK_RAW , AF_UNSPEC ) ;
 		}
 		m_socket->addReadHandler( *outer , es ) ;
 	}
diff --git a/src/gnet/glocal.cpp b/src/gnet/glocal.cpp
index 4297ad5..dfc7b96 100644
--- a/src/gnet/glocal.cpp
+++ b/src/gnet/glocal.cpp
@@ -44,7 +44,7 @@ std::string GNet::Local::resolvedHostname()
 	if( first )
 	{
 		first = false ;
-		static Location location( hostname() , "0" ) ;
+		static Location location( hostname().append(":0") ) ;
 		bool ok = Resolver::resolve(location).empty() && !location.name().empty() ;
 		result = ok ? location.name() : (hostname()+".localnet") ;
 	}
diff --git a/src/gnet/glocation.cpp b/src/gnet/glocation.cpp
index 220a9c0..100caee 100644
--- a/src/gnet/glocation.cpp
+++ b/src/gnet/glocation.cpp
@@ -24,65 +24,59 @@
 #include "gresolver.h"
 #include "gassert.h"
 
-namespace GNet
-{
-	namespace LocationImp
-	{
-		constexpr const char * host_service_separators = ":/" ;
-	}
-}
-
-GNet::Location::Location( const std::string & host , const std::string & service , int family ) :
-	m_host(host) ,
-	m_service(service) ,
+GNet::Location::Location( const std::string & spec , int family ) :
+	m_host(head(sockless(spec))) ,
+	m_service(tail(sockless(spec))) ,
 	m_address_valid(false) ,
 	m_address(Address::defaultAddress()) ,
 	m_family(family) ,
-	m_dgram(false) ,
 	m_update_time(0U) ,
-	m_socks(false) ,
-	m_socks_far_port(0U)
+	m_using_socks(false)
+{
+	m_using_socks = socksified( spec , m_socks_far_host , m_socks_far_port ) ;
+	if( m_host.empty() )
+		throw InvalidFormat( spec ) ;
+	G_DEBUG( "GNet::Location::ctor: unresolved location [" << displayString() << "]" << (m_using_socks?" (using socks)":"") ) ;
+}
+
+GNet::Location::Location( const std::string & spec , int family , int ) : // nosocks() overload
+	m_host(head(spec)) ,
+	m_service(tail(spec)) ,
+	m_address_valid(false) ,
+	m_address(Address::defaultAddress()) ,
+	m_family(family) ,
+	m_update_time(0U) ,
+	m_using_socks(false)
 {
 	G_DEBUG( "GNet::Location::ctor: unresolved location [" << displayString() << "]" ) ;
 }
 
-GNet::Location::Location( const std::string & socks_host , const std::string & socks_service ,
-	const std::string & far_host , const std::string & far_service , int family ) :
-		m_host(socks_host) ,
-		m_service(socks_service) ,
-		m_address_valid(false) ,
-		m_address(Address::defaultAddress()) ,
-		m_family(family) ,
-		m_dgram(false) ,
-		m_update_time(0U) ,
-		m_socks(!far_host.empty()) ,
-		m_socks_far_host(far_host) ,
-		m_socks_far_port(0U)
-{
-	if( far_host.empty() != far_service.empty() )
-		throw InvalidFormat() ;
-	if( m_socks && !G::Str::isUInt(far_service) )
-		throw InvalidFormat( "invalid port number: [" + far_service + "]" ) ;
-	if( m_socks )
-		m_socks_far_port = G::Str::toUInt( far_service ) ;
-	G_DEBUG( "GNet::Location::ctor: unresolved location [" << displayString() << "]" << (m_socks?" (using socks)":"") ) ;
-}
-
-GNet::Location::Location( const std::string & location_string , int family ) :
-	m_host(head(sockless(location_string))) ,
-	m_service(tail(sockless(location_string))) ,
+GNet::Location::Location( const std::string & socks_server , const std::string & far_server , int family ) : // socks() overload
+	m_host(head(socks_server)) ,
+	m_service(tail(socks_server)) ,
 	m_address_valid(false) ,
 	m_address(Address::defaultAddress()) ,
 	m_family(family) ,
-	m_dgram(false) ,
 	m_update_time(0U) ,
-	m_socks(false) ,
-	m_socks_far_port(0U)
+	m_using_socks(true) ,
+	m_socks_far_host(head(far_server)) ,
+	m_socks_far_port(tail(far_server))
 {
-	m_socks = socksified( location_string , m_socks_far_host , m_socks_far_port ) ;
-	if( m_host.empty() || m_service.empty() )
-		throw InvalidFormat( location_string ) ;
-	G_DEBUG( "GNet::Location::ctor: unresolved location [" << displayString() << "]" << (m_socks?" (using socks)":"") ) ;
+	if( m_socks_far_host.empty() || m_socks_far_port.empty() )
+		throw InvalidFormat() ;
+	if( !G::Str::isUInt(m_socks_far_port) )
+		throw InvalidFormat( "invalid port number: [" + m_socks_far_port + "]" ) ;
+	G_DEBUG( "GNet::Location::ctor: unresolved location [" << displayString() << "]" << " (using socks)" ) ;
+}
+
+GNet::Location GNet::Location::nosocks( const std::string & spec , int family )
+{
+	return { spec , family , 1 } ;
+}
+
+GNet::Location GNet::Location::socks( const std::string & socks_server , const std::string & far_server )
+{
+	return { socks_server , far_server , AF_UNSPEC } ;
 }
 
 std::string GNet::Location::sockless( const std::string & s )
@@ -91,32 +85,31 @@ std::string GNet::Location::sockless( const std::string & s )
 	return G::Str::tail( s , s.find('@') , s ) ;
 }
 
-bool GNet::Location::socksified( const std::string & s , std::string & far_host , unsigned int & far_port )
+bool GNet::Location::socksified( const std::string & s , std::string & far_host_out , std::string & far_port_out )
 {
-	namespace imp = LocationImp ;
 	std::string::size_type pos = s.find('@') ;
 	if( pos != std::string::npos )
 	{
 		std::string ss = G::Str::head( s , pos ) ;
-		far_host = G::Str::head( ss , ss.find_last_of(imp::host_service_separators) ) ;
-		far_port = G::Str::toUInt( G::Str::tail( ss , ss.find_last_of(imp::host_service_separators) ) ) ;
+		far_host_out = G::Str::head( ss , ss.rfind(':') ) ;
+		far_port_out = G::Str::tail( ss , ss.rfind(':') ) ;
+		G::Str::toUInt( far_port_out ) ; // throw if not a number
 	}
 	return pos != std::string::npos ;
 }
 
 std::string GNet::Location::head( const std::string & s )
 {
-	namespace imp = LocationImp ;
-	std::string result = G::Str::head( s , s.find_last_of(imp::host_service_separators) ) ;
-	if( result.size() > 1U && result.at(0U) == '[' && result.at(result.size()-1U) == ']' )
-		result = result.substr( 1U , result.size()-2U ) ;
-	return result ;
+	std::size_t pos = s.rfind( ':' ) ;
+	std::string h = ( pos == std::string::npos && !s.empty() && s[0] == '/' ) ? s : G::Str::head( s , pos ) ;
+	if( h.size() > 1U && h.at(0U) == '[' && h.at(h.size()-1U) == ']' )
+		h = h.substr( 1U , h.size()-2U ) ;
+	return h ;
 }
 
 std::string GNet::Location::tail( const std::string & s )
 {
-	namespace imp = LocationImp ;
-	return G::Str::tail( s , s.find_last_of(imp::host_service_separators) ) ;
+	return G::Str::tail( s , s.rfind(':') ) ;
 }
 
 std::string GNet::Location::host() const
@@ -134,16 +127,16 @@ int GNet::Location::family() const
 	return m_family ;
 }
 
-bool GNet::Location::dgram() const
-{
-	return m_dgram ;
-}
-
-void GNet::Location::resolveTrivially()
+bool GNet::Location::resolveTrivially()
 {
 	std::string reason ;
-	if( !resolved() && Address::validStrings(m_host,m_service,&reason) )
-		update( Address(m_host,G::Str::toUInt(m_service)) , std::string() ) ;
+	std::string address_string = G::Str::join( ":" , m_host , m_service ) ;
+	if( !resolved() && Address::validString(address_string,&reason) )
+	{
+		Address address = Address::parse( address_string ) ;
+		update( address , std::string() ) ;
+	}
+	return resolved() ;
 }
 
 bool GNet::Location::resolved() const
@@ -158,13 +151,27 @@ GNet::Address GNet::Location::address() const
 
 void GNet::Location::update( const Address & address , const std::string & name )
 {
-	G_ASSERT( m_family == AF_UNSPEC || address.domain() == m_family ) ;
+	if( !update(address,name,std::nothrow) )
+		throw InvalidFamily() ;
+}
+
+bool GNet::Location::update( const Address & address , const std::string & name , std::nothrow_t )
+{
+	bool valid_family =
+		address.family() == Address::Family::ipv4 ||
+		address.family() == Address::Family::ipv6 ||
+		address.family() == Address::Family::local ;
+
+	if( !valid_family || ( m_family != AF_UNSPEC && address.af() != m_family ) )
+		return false ;
+
 	m_address = address ;
-	m_family = address.domain() ; // not family()
+	m_family = address.af() ; // not enum
 	m_address_valid = true ;
 	m_canonical_name = name ;
 	m_update_time = G::SystemTime::now() ;
 	G_DEBUG( "GNet::Location::ctor: resolved location [" << displayString() << "]" ) ;
+	return true ;
 }
 
 std::string GNet::Location::name() const
@@ -174,8 +181,19 @@ std::string GNet::Location::name() const
 
 std::string GNet::Location::displayString() const
 {
-	const char * ipvx = m_family == AF_UNSPEC ? "ip" : ( m_family == AF_INET ? "ipv4" : "ipv6" ) ;
-	return resolved() ? address().displayString() : (m_host+"/"+m_service+"/"+ipvx) ;
+	if( resolved() )
+	{
+		return address().displayString() ;
+	}
+	else if( m_host.find('/') == 0U )
+	{
+		return m_host ;
+	}
+	else
+	{
+		const char * ipvx = m_family == AF_UNSPEC ? "ip" : ( m_family == AF_INET ? "ipv4" : "ipv6" ) ;
+		return m_host + "/" + m_service + "/" + ipvx ;
+	}
 }
 
 G::SystemTime GNet::Location::updateTime() const
@@ -185,12 +203,13 @@ G::SystemTime GNet::Location::updateTime() const
 
 bool GNet::Location::socks() const
 {
-	return m_socks ;
+	return m_using_socks ;
 }
 
 unsigned int GNet::Location::socksFarPort() const
 {
-	return m_socks_far_port ;
+	G_ASSERT( m_socks_far_port.empty() || G::Str::isUInt(m_socks_far_port) ) ;
+	return m_socks_far_port.empty() ? 0U : G::Str::toUInt(m_socks_far_port) ;
 }
 
 std::string GNet::Location::socksFarHost() const
diff --git a/src/gnet/glocation.h b/src/gnet/glocation.h
index 44a7af4..c7fdde0 100644
--- a/src/gnet/glocation.h
+++ b/src/gnet/glocation.h
@@ -25,6 +25,7 @@
 #include "gaddress.h"
 #include "gdatetime.h"
 #include "gexception.h"
+#include <new>
 
 namespace GNet
 {
@@ -33,68 +34,95 @@ namespace GNet
 }
 
 //| \class GNet::Location
-/// A class that holds a host/service name pair and the preferred address
-/// family (if any), and also the results of a name-to-address lookup, ie. the
-/// remote address and canonical host name. The actual name-to-address lookup
-/// is done externally, and the results are deposited into the Location object
-/// with update().
+/// A class that represents the remote target for out-going client connections.
+/// It holds a host/service name pair and the preferred address family (if any)
+/// and also the results of a DNS lookup, ie. the remote address and canonical
+/// host name.
 ///
-/// One of the constructors allows an extended host/service format for
-/// transparent SOCKS support: before the "@" separator is the host/service
-/// pair passed verbatim to the socks server for it to resolve (see
-/// socksFarHost()); after the "@" is the host/service pair for the
-/// socks server itself, which we resolve and connect to (see host()).
+/// The actual DNS lookup of host() and service() should be done externally,
+/// with the results deposited into the Location object with update().
 ///
-/// \see GNet::Client
+/// An extended format is supported for transparent SOCKS connection: before
+/// the "@" separator is the host/port pair passed verbatim to the socks
+/// server for it to resolve; after the "@" is the host/service pair for
+/// the socks server itself, which should be resolved as normal.
+///
+/// URL-style square brackets can be used for IPv6 address, eg( "[::1]:1").
+///
+/// Local-domain socket addresses are supported, but obviously DNS lookups
+/// of host() and service() will never work, update() will reject them,
+/// and the socks code will not allow them as the 'far' address.
+///
+/// Synopsis:
+/// \code
+/// Location location( remote_server ) ;
+/// location.resolveTrivially() ;
+/// if( !location.resolved() )
+/// {
+///   Resolver resolver( location.host() , location.service() , location.family() ) ;
+///   if( resolver.resolve() )
+///     location.update( resolver.address() , resolver.cname() ) ;
+/// }
+/// \endcode
+///
+/// \see GNet::Client, GNet::Resolver
 ///
 class GNet::Location
 {
 public:
 	G_EXCEPTION( InvalidFormat , "invalid host:service format" ) ;
+	G_EXCEPTION( InvalidFamily , "invalid address family" ) ;
 
-	Location( const std::string & host , const std::string & service , int family = AF_UNSPEC ) ;
-		///< Constructor taking a host/service string.
+	explicit Location( const std::string & spec , int family = AF_UNSPEC ) ;
+		///< Constructor taking a formatted "host:service" string.
+		///< The location specification allows an extended format for
+		///< socks, as "far-host:far-port@socks-host:socks-service".
+		///< Throws if incorrectly formatted. The optional 'family'
+		///< parameter is made available to the resolver via
+		///< the family() method.
 
-	Location( const std::string & socks_host , const std::string & socks_service ,
-		const std::string & far_host , const std::string & far_service ,
-		int family = AF_UNSPEC ) ;
-			///< Constructor for socks. The first pair of parameters are for
-			///< the socks server, and the second pair are for the target
-			///< server.
+	static Location nosocks( const std::string & spec , int family = AF_UNSPEC ) ;
+		///< Factory function for a remote location but not allowing
+		///< the extended syntax for socks.
 
-	explicit Location( const std::string & location_string , int family = AF_UNSPEC ) ;
-		///< Constructor taking a formatted host/service string.
-		///< The format supports the extended format for socks as
-		///< "far-host:far-service@socks-host:socks-service".
-		///< Throws if incorrectly formatted.
+	static Location socks( const std::string & socks_server , const std::string & far_server ) ;
+		///< Factory function for a remote location explicitly
+		///< accessed via socks.
+
+	std::string host() const ;
+		///< Returns the remote host name derived from the constructor
+		///< parameter.
+
+	std::string service() const ;
+		///< Returns the remote service name derived from the constructor
+		///< parameter.
+
+	int family() const ;
+		///< Returns the preferred name resolution address family as
+		///< passed to the constructor.
 
 	bool socks() const ;
 		///< Returns true if a socks location.
 
-	std::string host() const ;
-		///< Returns the remote host name, as passed in to the constructor.
-
-	std::string service() const ;
-		///< Returns the remote service name, as passed in to the constructor.
-
-	void resolveTrivially() ;
+	bool resolveTrivially() ;
 		///< If host() and service() are already in address format then do a trivial
 		///< update() so that the location is immediately resolved(), albeit with an
-		///< empty canonical name().
+		///< empty canonical name(). Does nothing if already resolved(). Returns
+		///< resolved().
 
 	void update( const Address & address , const std::string & canonical_name ) ;
 		///< Updates the address and canonical name, typically after doing
-		///< a name lookup on host() and service().
+		///< a name lookup on host() and service(). Throws if an invalid address
+		///< family.
 
-	int family() const ;
-		///< Returns the preferred name resolution address family, or AF_UNSPEC.
-
-	bool dgram() const ;
-		///< Returns true if the name resolution should be specifically for datagram
-		///< sockets.
+	bool update( const Address & address , const std::string & canonical_name , std::nothrow_t ) ;
+		///< Updates the address and canonical name, typically after doing
+		///< a name lookup on host() and service(). Returns false if an invalid
+		///< address family.
 
 	bool resolved() const ;
-		///< Returns true after update() has been called.
+		///< Returns true after update() has been called or resolveTrivially()
+		///< succeeded.
 
 	Address address() const ;
 		///< Returns the remote address.
@@ -118,9 +146,11 @@ public:
 		///< Precondition: socks()
 
 private:
+	Location( const std::string & socks , const std::string & far_ , int family ) ; // socks()
+	Location( const std::string & spec , int family , int ) ; // nosocks()
 	static std::string head( const std::string & ) ;
 	static std::string tail( const std::string & ) ;
-	static bool socksified( const std::string & , std::string & , unsigned int & ) ;
+	static bool socksified( const std::string & , std::string & , std::string & ) ;
 	static std::string sockless( const std::string & ) ;
 
 private:
@@ -129,12 +159,11 @@ private:
 	bool m_address_valid ;
 	Address m_address ;
 	int m_family ;
-	bool m_dgram ;
 	std::string m_canonical_name ;
 	G::SystemTime m_update_time ;
-	bool m_socks ;
+	bool m_using_socks ;
 	std::string m_socks_far_host ;
-	unsigned int m_socks_far_port ;
+	std::string m_socks_far_port ;
 } ;
 
 namespace GNet
diff --git a/src/gnet/gmultiserver.cpp b/src/gnet/gmultiserver.cpp
index dd6ad7f..4ed785e 100644
--- a/src/gnet/gmultiserver.cpp
+++ b/src/gnet/gmultiserver.cpp
@@ -29,12 +29,13 @@
 #include <algorithm>
 
 GNet::MultiServer::MultiServer( ExceptionSink es , const G::StringArray & interfaces , unsigned int port ,
-	const std::string & server_type , ServerPeerConfig server_peer_config ) :
+	const std::string & server_type , ServerPeerConfig server_peer_config , ServerConfig server_config ) :
 		m_es(es) ,
 		m_interfaces(interfaces) ,
 		m_port(port) ,
 		m_server_type(server_type) ,
 		m_server_peer_config(server_peer_config) ,
+		m_server_config(server_config) ,
 		m_if(es,*this) ,
 		m_interface_event_timer(*this,&MultiServer::onInterfaceEventTimeout,es)
 {
@@ -45,7 +46,12 @@ GNet::MultiServer::MultiServer( ExceptionSink es , const G::StringArray & interf
 	// build a listening address list from explicit addresses and/or interface names
 	G::StringArray empty_names ; // interface names having no addresses
 	G::StringArray used_names ; // interface names having one or more addresses
-	AddressList address_list = addresses( port , used_names , empty_names ) ;
+	G::StringArray bad_names ; // non-address non-interface names
+	AddressList address_list = addresses( port , used_names , empty_names , bad_names ) ;
+
+	// fail if any bad names
+	if( !bad_names.empty() )
+		throw InvalidName( bad_names.at(0) ) ;
 
 	// fail if no addresses and no prospect of getting any
 	if( address_list.empty() && ( empty_names.empty() || !Interfaces::active() ) )
@@ -65,7 +71,7 @@ GNet::MultiServer::MultiServer( ExceptionSink es , const G::StringArray & interf
 	}
 
 	// bind the listening addresses, etc
-	init( address_list , server_peer_config ) ;
+	init( address_list ) ;
 
 	// warn if we got addresses from an interface name but won't get dynamic updates
 	if( !used_names.empty() && !Interfaces::active() )
@@ -90,11 +96,12 @@ std::vector<GNet::Address> GNet::MultiServer::addresses( unsigned int port ) con
 	AddressList result ;
 	G::StringArray empty_names ;
 	G::StringArray used_names ;
-	return addresses( port , used_names , empty_names ) ;
+	G::StringArray bad_names ;
+	return addresses( port , used_names , empty_names , bad_names ) ;
 }
 
 std::vector<GNet::Address> GNet::MultiServer::addresses( unsigned int port , G::StringArray & used_names ,
-	G::StringArray & empty_names ) const
+	G::StringArray & empty_names , G::StringArray & bad_names ) const
 {
 	AddressList result ;
 	if( m_interfaces.empty() )
@@ -106,16 +113,16 @@ std::vector<GNet::Address> GNet::MultiServer::addresses( unsigned int port , G::
 	}
 	else
 	{
-		result = m_if.addresses( m_interfaces , port , used_names , empty_names ) ;
+		result = m_if.addresses( m_interfaces , port , used_names , empty_names , bad_names ) ;
 	}
 	return result ;
 }
 
-void GNet::MultiServer::init( const AddressList & address_list , ServerPeerConfig server_peer_config )
+void GNet::MultiServer::init( const AddressList & address_list )
 {
 	for( const auto & address : address_list )
 	{
-		m_server_list.emplace_back( std::make_unique<MultiServerImp>( *this , m_es,address , server_peer_config ) ) ;
+		m_server_list.emplace_back( std::make_unique<MultiServerImp>( *this , m_es , address , m_server_peer_config , m_server_config ) ) ;
 	}
 }
 
@@ -171,7 +178,7 @@ void GNet::MultiServer::onInterfaceEventTimeout()
 		{
 			try
 			{
-				m_server_list.emplace_back( std::make_unique<MultiServerImp>( *this , m_es , address , m_server_peer_config ) ) ;
+				m_server_list.emplace_back( std::make_unique<MultiServerImp>( *this , m_es , address , m_server_peer_config , m_server_config ) ) ;
 				G_LOG_S( "GNet::MultiServer::onInterfaceEvent: new " << m_server_type
 					<< " server on " << displayString(address) ) ;
 			}
@@ -242,8 +249,8 @@ std::vector<std::weak_ptr<GNet::ServerPeer> > GNet::MultiServer::peers()
 // ==
 
 GNet::MultiServerImp::MultiServerImp( MultiServer & ms , ExceptionSink es , const Address & address ,
-	ServerPeerConfig server_peer_config ) :
-		GNet::Server(es,address,server_peer_config) ,
+	ServerPeerConfig server_peer_config , ServerConfig server_config ) :
+		GNet::Server(es,address,server_peer_config,server_config) ,
 		m_ms(ms) ,
 		m_address(address)
 {
diff --git a/src/gnet/gmultiserver.h b/src/gnet/gmultiserver.h
index 7d95db3..f602df7 100644
--- a/src/gnet/gmultiserver.h
+++ b/src/gnet/gmultiserver.h
@@ -46,6 +46,7 @@ class GNet::MultiServer : private InterfacesHandler
 public:
 	using AddressList = std::vector<Address> ;
 	G_EXCEPTION( NoListeningAddresses , "no listening addresses" ) ;
+	G_EXCEPTION( InvalidName , "invalid address or interface name" ) ;
 
 	struct ServerInfo /// A structure used in GNet::MultiServer::newPeer().
 	{
@@ -54,7 +55,8 @@ public:
 	} ;
 
 	MultiServer( ExceptionSink listener_exception_sink , const G::StringArray & addresses ,
-		unsigned int port , const std::string & server_type , ServerPeerConfig server_peer_config ) ;
+		unsigned int port , const std::string & server_type , ServerPeerConfig server_peer_config ,
+		ServerConfig server_config ) ;
 			///< Constructor. The server listens on on the specific local
 			///< addresses, given as either interface names (eg. "eth0")
 			///< or IP network addresses (eg. "::1") together with a
@@ -105,8 +107,8 @@ public:
 private:
 	friend class GNet::MultiServerImp ;
 	AddressList addresses( unsigned int ) const ;
-	AddressList addresses( unsigned int , G::StringArray & , G::StringArray & ) const ;
-	void init( const AddressList & address_list , ServerPeerConfig ) ;
+	AddressList addresses( unsigned int , G::StringArray & , G::StringArray & , G::StringArray & ) const ;
+	void init( const AddressList & address_list ) ;
 	bool gotServerFor( const Address & ) const ;
 	void onInterfaceEventTimeout() ;
 	static bool match( const Address & , const Address & ) ;
@@ -120,6 +122,7 @@ private:
 	unsigned int m_port ;
 	std::string m_server_type ;
 	ServerPeerConfig m_server_peer_config ;
+	ServerConfig m_server_config ;
 	Interfaces m_if ;
 	ServerList m_server_list ;
 	Timer<MultiServer> m_interface_event_timer ;
@@ -131,7 +134,7 @@ private:
 class GNet::MultiServerImp : public GNet::Server
 {
 public:
-	MultiServerImp( MultiServer & , ExceptionSink , const Address & , ServerPeerConfig ) ;
+	MultiServerImp( MultiServer & , ExceptionSink , const Address & , ServerPeerConfig , ServerConfig ) ;
 		///< Constructor.
 
 	~MultiServerImp() override ;
diff --git a/src/gnet/gresolver.cpp b/src/gnet/gresolver.cpp
index d580cd7..91cf605 100644
--- a/src/gnet/gresolver.cpp
+++ b/src/gnet/gresolver.cpp
@@ -91,7 +91,7 @@ GNet::ResolverImp::ResolverImp( Resolver & resolver , ExceptionSink es , const L
 	m_future_event(std::make_unique<FutureEvent>(static_cast<FutureEventHandler&>(*this),es)) ,
 	m_timer(*this,&ResolverImp::onTimeout,es) ,
 	m_location(location) ,
-	m_future(location.host(),location.service(),location.family(),location.dgram(),true)
+	m_future(location.host(),location.service(),location.family(),/*dgram=*/false,true)
 {
 	G_ASSERT( G::threading::works() ) ; // see Resolver::start()
 	G::Cleanup::Block block_signals ;
@@ -197,7 +197,7 @@ std::string GNet::Resolver::resolve( Location & location )
 	using Pair = ResolverFuture::Pair ;
 	G_DEBUG( "GNet::Resolver::resolve: resolve request [" << location.displayString() << "]"
 		<< " (" << location.family() << ")" ) ;
-	ResolverFuture future( location.host() , location.service() , location.family() , location.dgram() ) ;
+	ResolverFuture future( location.host() , location.service() , location.family() , /*dgram=*/false ) ;
 	future.run() ; // blocks until complete
 	Pair result = future.get() ;
 	if( future.error() )
diff --git a/src/gnet/gserver.cpp b/src/gnet/gserver.cpp
index b456914..b997878 100644
--- a/src/gnet/gserver.cpp
+++ b/src/gnet/gserver.cpp
@@ -23,28 +23,50 @@
 #include "gnetdone.h"
 #include "gmonitor.h"
 #include "geventloggingcontext.h"
+#include "gcleanup.h"
+#include "gprocess.h"
 #include "glimits.h"
 #include "groot.h"
 #include "glog.h"
 #include "gassert.h"
+#include <algorithm>
 
 GNet::Server::Server( ExceptionSink es , const Address & listening_address ,
-	ServerPeerConfig server_peer_config ) :
+	ServerPeerConfig server_peer_config , ServerConfig server_config ) :
 		m_es(es) ,
 		m_server_peer_config(server_peer_config) ,
-		m_socket(listening_address.domain(),StreamSocket::Listener())
+		m_socket(listening_address.family(),StreamSocket::Listener())
 {
 	G_DEBUG( "GNet::Server::ctor: listening on socket " << m_socket.asString()
 		<< " with address " << listening_address.displayString() ) ;
 
+	bool uds = listening_address.family() == Address::Family::local ;
+	if( uds )
+	{
+		bool open = server_config.uds_open_permissions ;
+		using Mode = G::Process::Umask::Mode ;
+		G::Root claim_root( false ) ; // group ownership from the effective group-id
+		G::Process::Umask set_umask( open ? Mode::Open : Mode::Tighter ) ;
+		m_socket.bind( listening_address ) ;
+	}
+	else
 	{
 		G::Root claim_root ;
 		m_socket.bind( listening_address ) ;
 	}
 
-	m_socket.listen( G::limits::net_listen_queue ) ;
+	m_socket.listen( std::max(1,server_config.listen_queue) ) ;
 	m_socket.addReadHandler( *this , m_es ) ;
 	Monitor::addServer( *this ) ;
+
+	if( uds )
+	{
+		std::string path = listening_address.hostPartString( true ) ;
+		if( path.size() > 1U && path.at(0U) == '/' ) // (just in case)
+		{
+			G::Cleanup::add( &Server::unlink , G::Cleanup::strdup(path) ) ;
+		}
+	}
 }
 
 GNet::Server::~Server()
@@ -54,21 +76,20 @@ GNet::Server::~Server()
 
 bool GNet::Server::canBind( const Address & address , bool do_throw )
 {
-	StreamSocket socket( address.domain() ) ;
-	bool ok = false ;
+	std::string reason ;
 	{
 		G::Root claim_root ;
-		ok = socket.canBindHint( address ) ;
+		reason = Socket::canBindHint( address ) ;
 	}
-	if( !ok && do_throw )
-		throw CannotBind( address.displayString() , socket.reason() ) ;
-	return ok ;
+	if( !reason.empty() && do_throw )
+		throw CannotBind( address.displayString() , reason ) ;
+	return reason.empty() ;
 }
 
 GNet::Address GNet::Server::address() const
 {
 	bool with_scope = true ; // was false
-	Address result = m_socket.getLocalAddress().second ;
+	Address result = m_socket.getLocalAddress() ;
 	if( with_scope )
 		result.setScopeId( m_socket.getBoundScopeId() ) ;
 	return result ;
@@ -121,8 +142,8 @@ void GNet::Server::accept( ServerPeerInfo & peer_info )
 		G::Root claim_root ;
 		accept_pair = m_socket.accept() ;
 	}
-	peer_info.m_socket = accept_pair.first ;
-	peer_info.m_address = accept_pair.second ;
+	peer_info.m_socket = accept_pair.socket_ptr ;
+	peer_info.m_address = accept_pair.address ;
 }
 
 void GNet::Server::onException( ExceptionSource * esrc , std::exception & e , bool done )
@@ -175,6 +196,11 @@ void GNet::Server::writeEvent()
 	G_DEBUG( "GNet::Server::writeEvent" ) ;
 }
 
+bool GNet::Server::unlink( G::SignalSafe , const char * path ) noexcept
+{
+	return path ? ( std::remove(path) == 0 ) : true ;
+}
+
 // ===
 
 GNet::ServerPeerInfo::ServerPeerInfo( Server * server , ServerPeerConfig config ) :
diff --git a/src/gnet/gserver.h b/src/gnet/gserver.h
index ea3b024..e039bfd 100644
--- a/src/gnet/gserver.h
+++ b/src/gnet/gserver.h
@@ -25,8 +25,10 @@
 #include "ggettext.h"
 #include "gserverpeer.h"
 #include "gexceptionsink.h"
+#include "gexception.h"
 #include "gsocket.h"
 #include "glistener.h"
+#include "glimits.h"
 #include "gevent.h"
 #include <utility>
 #include <memory>
@@ -34,12 +36,23 @@
 
 namespace GNet
 {
+	struct ServerConfig ;
 	class Server ;
 	class ServerPeer ;
 	class ServerPeerConfig ;
 	class ServerPeerInfo ;
 }
 
+//| \class GNet::ServerConfig
+/// A configuration structure for GNet::Server.
+///
+struct GNet::ServerConfig
+{
+	int listen_queue { G::limits::net_listen_queue } ; // Socket::listen() 'backlog'
+	bool uds_open_permissions { true } ;
+	ServerConfig & set_uds_open_permissions( bool b = true ) ;
+} ;
+
 //| \class GNet::Server
 /// A network server class which listens on a specific port and spins off
 /// ServerPeer objects for each incoming connection.
@@ -50,7 +63,7 @@ class GNet::Server : public Listener, private EventHandler, private ExceptionHan
 public:
 	G_EXCEPTION( CannotBind , G::gettext_noop("cannot bind the listening port") ) ;
 
-	Server( ExceptionSink , const Address & listening_address , ServerPeerConfig ) ;
+	Server( ExceptionSink , const Address & listening_address , ServerPeerConfig , ServerConfig ) ;
 		///< Constructor. The server listens on the given address,
 		///< which can be the 'any' address. The ExceptionSink
 		///< is used for exceptions relating to the listening
@@ -112,6 +125,7 @@ public:
 
 private:
 	void accept( ServerPeerInfo & ) ;
+	static bool unlink( G::SignalSafe , const char * ) noexcept ;
 
 private:
 	using PeerList = std::vector<std::shared_ptr<ServerPeer> > ;
@@ -134,4 +148,6 @@ public:
 	ServerPeerInfo( Server * , ServerPeerConfig ) ;
 } ;
 
+inline GNet::ServerConfig & GNet::ServerConfig::set_uds_open_permissions( bool b ) { uds_open_permissions = b ; return *this ; }
+
 #endif
diff --git a/src/gnet/gserverpeer.cpp b/src/gnet/gserverpeer.cpp
index dd76700..f9638a6 100644
--- a/src/gnet/gserverpeer.cpp
+++ b/src/gnet/gserverpeer.cpp
@@ -82,7 +82,7 @@ void GNet::ServerPeer::readEvent()
 std::pair<bool,GNet::Address> GNet::ServerPeer::localAddress() const
 {
 	G_ASSERT( m_socket != nullptr ) ;
-	return m_socket->getLocalAddress() ;
+	return std::make_pair( true , m_socket->getLocalAddress() ) ;
 }
 
 std::pair<bool,GNet::Address> GNet::ServerPeer::peerAddress() const
diff --git a/src/gnet/gsocket.cpp b/src/gnet/gsocket.cpp
index 03690c3..74386df 100644
--- a/src/gnet/gsocket.cpp
+++ b/src/gnet/gsocket.cpp
@@ -24,31 +24,99 @@
 #include "gsleep.h"
 #include "gmsg.h"
 #include "gstr.h"
+#include "gassert.h"
 #include "glog.h"
 
-GNet::SocketBase::SocketBase( int domain , int type , int protocol ) :
-	m_reason(0) ,
-	m_domain(domain)
+namespace GNet
 {
-	if( !create(domain,type,protocol) )
-		throw SocketCreateError( "cannot create socket" , m_reason_string ) ;
+	namespace StreamSocketImp /// An implementation namespace for G::StreamSocket.
+	{
+		struct Options /// StreamSocket options
+		{
+			enum class Linger { default_ , zero , nolinger } ;
+			Linger create_linger {Linger::nolinger} ;
+			bool create_keepalive { G::Test::enabled("socket-keepalive") } ;
+			Linger accept_linger {Linger::nolinger} ;
+			bool accept_keepalive { G::Test::enabled("socket-keepalive") } ;
+		} ;
+	}
+	namespace SocketImp /// An implementation namespace for G::Socket.
+	{
+		struct Options /// Socket options
+		{
+			bool connect_pureipv6 {true} ;
+			bool bind_pureipv6 {true} ;
+			bool bind_reuse {true} ;
+			bool bind_exclusive { G::Test::enabled("socket-exclusive") } ;
+		} ;
+	}
+}
+
+// ==
+
+GNet::SocketBase::SocketBase( Address::Family family , int type , int protocol ) :
+	m_reason(0) ,
+	m_domain(Address::domain(family)) ,
+	m_family(family) ,
+	m_added(false) ,
+	m_accepted(false)
+{
+	if( !create(m_domain,type,protocol) )
+		throw SocketCreateError( "cannot create socket" , reason() ) ;
 
 	if( !prepare(false) )
 	{
 		destroy() ;
-		throw SocketError( "cannot prepare socket" , m_reason_string ) ;
+		throw SocketError( "cannot prepare socket" , reason() ) ;
 	}
 }
 
-GNet::SocketBase::SocketBase( int domain , Descriptor fd , const Accepted & ) :
+GNet::SocketBase::SocketBase( const SocketBase::Raw & , int domain , int type , int protocol ) :
 	m_reason(0) ,
-	m_domain(domain),
-	m_fd(fd)
+	m_domain(domain) ,
+	m_family(Address::Family::local) , // bogus value, see isFamily()
+	m_added(false) ,
+	m_accepted(false)
+{
+	G_ASSERT( !Address::supports( Address::Domain() , domain ) ) ;
+
+	if( !create(domain,type,protocol) )
+		throw SocketCreateError( "cannot create socket" , reason() ) ;
+
+	if( !prepare(false) )
+	{
+		destroy() ;
+		throw SocketError( "cannot prepare socket" , reason() ) ;
+	}
+}
+
+GNet::SocketBase::SocketBase( Address::Family family , Descriptor fd ) :
+	m_reason(0) ,
+	m_domain(Address::domain(family)) ,
+	m_family(family) ,
+	m_fd(fd) ,
+	m_added(false) ,
+	m_accepted(false)
+{
+	if( !prepare(false) )
+	{
+		destroy() ;
+		throw SocketError( "cannot prepare socket" , reason() ) ;
+	}
+}
+
+GNet::SocketBase::SocketBase( Address::Family family , Descriptor fd , const Accepted & ) :
+	m_reason(0) ,
+	m_domain(Address::domain(family)) ,
+	m_family(family) ,
+	m_fd(fd) ,
+	m_added(false) ,
+	m_accepted(true)
 {
 	if( !prepare(true) )
 	{
 		destroy() ;
-		throw SocketError( "cannot prepare socket" , m_reason_string ) ;
+		throw SocketError( "cannot prepare socket" , reason() ) ;
 	}
 }
 
@@ -58,6 +126,13 @@ GNet::SocketBase::~SocketBase()
 	destroy() ;
 }
 
+bool GNet::SocketBase::isFamily( Address::Family family ) const
+{
+	// note that raw sockets to not have a family supported by
+	// GNet::Address and their m_address field is bogus
+	return Address::supports(Address::Domain(),m_domain) && family == m_family ;
+}
+
 void GNet::SocketBase::drop() noexcept
 {
 	dropReadHandler() ;
@@ -68,7 +143,6 @@ void GNet::SocketBase::drop() noexcept
 void GNet::SocketBase::clearReason()
 {
 	m_reason = 0 ;
-	m_reason_string.clear() ;
 }
 
 void GNet::SocketBase::saveReason() const
@@ -85,7 +159,7 @@ GNet::SocketBase::ssize_type GNet::SocketBase::writeImp( const char * buffer , s
 	if( sizeError(nsent) ) // if -1
 	{
 		saveReason() ;
-		G_DEBUG( "GNet::SocketBase::writeImp: write error: " << m_reason_string ) ;
+		G_DEBUG( "GNet::SocketBase::writeImp: write error: " << reason() ) ;
 		return -1 ;
 	}
 	else if( nsent < 0 || static_cast<size_type>(nsent) < length )
@@ -99,35 +173,38 @@ void GNet::SocketBase::addReadHandler( EventHandler & handler , ExceptionSink es
 {
 	G_DEBUG( "GNet::SocketBase::addReadHandler: fd " << m_fd ) ;
 	EventLoop::instance().addRead( m_fd , handler , es ) ;
+	m_added = true ;
 }
 
 void GNet::SocketBase::addWriteHandler( EventHandler & handler , ExceptionSink es )
 {
 	G_DEBUG( "GNet::SocketBase::addWriteHandler: fd " << m_fd ) ;
 	EventLoop::instance().addWrite( m_fd , handler , es ) ;
+	m_added = true ;
 }
 
 void GNet::SocketBase::addOtherHandler( EventHandler & handler , ExceptionSink es )
 {
 	G_DEBUG( "GNet::SocketBase::addOtherHandler: fd " << m_fd ) ;
 	EventLoop::instance().addOther( m_fd , handler , es ) ;
+	m_added = true ;
 }
 
 void GNet::SocketBase::dropReadHandler() noexcept
 {
-	if( EventLoop::ptr() )
+	if( m_added && EventLoop::ptr() )
 		EventLoop::ptr()->dropRead( m_fd ) ;
 }
 
 void GNet::SocketBase::dropWriteHandler() noexcept
 {
-	if( EventLoop::ptr() )
+	if( m_added && EventLoop::ptr() )
 		EventLoop::ptr()->dropWrite( m_fd ) ;
 }
 
 void GNet::SocketBase::dropOtherHandler() noexcept
 {
-	if( EventLoop::ptr() )
+	if( m_added && EventLoop::ptr() )
 		EventLoop::ptr()->dropOther( m_fd ) ;
 }
 
@@ -136,14 +213,9 @@ SOCKET GNet::SocketBase::fd() const noexcept
 	return m_fd.fd() ;
 }
 
-int GNet::SocketBase::domain() const
-{
-	return m_domain ;
-}
-
 std::string GNet::SocketBase::reason() const
 {
-	if( m_reason == 0 ) return std::string() ;
+	if( m_reason == 0 ) return {} ;
 	return reasonString( m_reason ) ;
 }
 
@@ -156,13 +228,13 @@ std::string GNet::SocketBase::asString() const
 
 // ==
 
-GNet::Socket::Socket( int domain , int type , int protocol ) :
-	SocketBase(domain,type,protocol)
+GNet::Socket::Socket( Address::Family af , int type , int protocol ) :
+	SocketBase(af,type,protocol)
 {
 }
 
-GNet::Socket::Socket( int domain , Descriptor s , const Accepted & a ) :
-	SocketBase(domain,s,a)
+GNet::Socket::Socket( Address::Family af , Descriptor s , const Accepted & a ) :
+	SocketBase(af,s,a)
 {
 }
 
@@ -170,10 +242,10 @@ void GNet::Socket::bind( const Address & local_address )
 {
 	G_DEBUG( "Socket::bind: binding " << local_address.displayString() << " on fd " << fd() ) ;
 
-	if( local_address.domain() != domain() )
+	if( !isFamily( local_address.family() ) )
 		throw SocketBindError( "address family does not match the socket domain" ) ;
 
-	setOptionsOnBind( local_address.family() == Address::Family::ipv6 ) ;
+	setOptionsOnBind( local_address.family() ) ;
 
 	int rc = ::bind( fd() , local_address.address() , local_address.length() ) ;
 	if( error(rc) )
@@ -187,9 +259,10 @@ void GNet::Socket::bind( const Address & local_address )
 bool GNet::Socket::bind( const Address & local_address , std::nothrow_t )
 {
 	G_DEBUG( "Socket::bind: binding " << local_address.displayString() << " on fd " << fd() ) ;
-	if( local_address.domain() != domain() ) return false ;
+	if( !isFamily( local_address.family() ) )
+		return false ;
 
-	setOptionsOnBind( local_address.family() == Address::Family::ipv6 ) ;
+	setOptionsOnBind( local_address.family() ) ;
 
 	int rc = ::bind( fd() , local_address.address() , local_address.length() ) ;
 	if( error(rc) )
@@ -206,17 +279,16 @@ unsigned long GNet::Socket::getBoundScopeId() const
 	return m_bound_scope_id ;
 }
 
-bool GNet::Socket::connect( const Address & address , bool *done )
+bool GNet::Socket::connect( const Address & address , bool * done )
 {
 	G_DEBUG( "GNet::Socket::connect: connecting to " << address.displayString() ) ;
-	if( address.domain() != domain() )
+	if( !isFamily( address.family() ) )
 	{
-		G_WARNING( "GNet::Socket::connect: cannot connect: address family does not match "
-			"the socket domain (" << address.domain() << "," << domain() << ")" ) ;
+		G_WARNING( "GNet::Socket::connect: cannot connect: address family does not match the socket domain" ) ;
 		return false ;
 	}
 
-	setOptionsOnConnect( address.family() == Address::Family::ipv6 ) ;
+	setOptionsOnConnect( address.family() ) ;
 
 	int rc = ::connect( fd() , address.address() , address.length() ) ;
 	if( error(rc) )
@@ -251,37 +323,30 @@ void GNet::Socket::listen( int backlog )
 	}
 }
 
-std::pair<bool,GNet::Address> GNet::Socket::getAddress( bool local ) const
+GNet::Address GNet::Socket::getLocalAddress() const
 {
-	std::pair<bool,Address> error_pair( false , Address::defaultAddress() ) ;
 	AddressStorage address_storage ;
-	int rc =
-		local ?
-			::getsockname( fd() , address_storage.p1() , address_storage.p2() ) :
-			::getpeername( fd() , address_storage.p1() , address_storage.p2() ) ;
-
+	int rc = ::getsockname( fd() , address_storage.p1() , address_storage.p2() ) ;
 	if( error(rc) )
 	{
 		saveReason() ;
-		return error_pair ;
+		throw SocketError( "getsockname" , reason() ) ;
 	}
-
-	return std::pair<bool,Address>( true , Address(address_storage) ) ;
-}
-
-std::pair<bool,GNet::Address> GNet::Socket::getLocalAddress() const
-{
-	return getAddress( true ) ;
+	return Address( address_storage ) ;
 }
 
 std::pair<bool,GNet::Address> GNet::Socket::getPeerAddress() const
 {
-	return getAddress( false ) ;
-}
-
-bool GNet::Socket::hasPeer() const
-{
-	return getPeerAddress().first ;
+	AddressStorage address_storage ;
+	int rc = ::getpeername( fd() , address_storage.p1() , address_storage.p2() ) ;
+	if( error(rc) )
+	{
+		saveReason() ;
+		if( eNotConn() )
+			return { false , Address::defaultAddress() } ;
+		throw SocketError( "getpeername" , reason() ) ;
+	}
+	return { true , Address(address_storage) } ;
 }
 
 void GNet::Socket::shutdown( int how )
@@ -290,6 +355,70 @@ void GNet::Socket::shutdown( int how )
 	::shutdown( fd() , how ) ;
 }
 
+void GNet::Socket::setOptionsOnConnect( Address::Family af )
+{
+	if( af == Address::Family::ipv4 || af == Address::Family::ipv6 )
+	{
+		using namespace SocketImp ;
+		Options options ;
+		if( af == Address::Family::ipv6 && options.connect_pureipv6 )
+			setOptionPureV6( std::nothrow ) ; // ignore errors - may fail if already bound
+	}
+}
+
+void GNet::Socket::setOptionsOnBind( Address::Family af )
+{
+	if( af == Address::Family::ipv4 || af == Address::Family::ipv6 )
+	{
+		using namespace SocketImp ;
+		Options options ;
+		if( options.bind_reuse )
+			setOptionReuse() ; // allow us to rebind another socket's (eg. time-wait zombie's) address
+		if( options.bind_exclusive )
+			setOptionExclusive() ; // don't allow anyone else to bind our address
+		if( af == Address::Family::ipv6 && options.bind_pureipv6 )
+			setOptionPureV6() ;
+	}
+}
+
+void GNet::Socket::setOptionKeepAlive()
+{
+	setOption( SOL_SOCKET , "so_keepalive" , SO_KEEPALIVE , 1 ) ;
+}
+
+void GNet::Socket::setOptionNoLinger()
+{
+	setOptionLingerImp( 0 , 0 ) ;
+}
+
+void GNet::Socket::setOptionLingerImp( int onoff , int time )
+{
+	struct linger options {} ;
+	options.l_onoff = onoff ;
+	options.l_linger = time ;
+	bool ok = setOptionImp( SOL_SOCKET , SO_LINGER , &options , sizeof(options) ) ;
+	if( !ok )
+	{
+		saveReason() ;
+		throw SocketError( "cannot set no_linger" , reason() ) ;
+	}
+}
+
+bool GNet::Socket::setOption( int level , const char * , int op , int arg , std::nothrow_t )
+{
+	const void * const vp = static_cast<const void*>(&arg) ;
+	bool ok = setOptionImp( level , op , vp , sizeof(int) ) ;
+	if( !ok )
+		saveReason() ;
+	return ok ;
+}
+
+void GNet::Socket::setOption( int level , const char * opp , int op , int arg )
+{
+	if( !setOption( level , opp , op , arg , std::nothrow ) )
+		throw SocketError( opp , reason() ) ;
+}
+
 //==
 
 bool GNet::StreamSocket::supports( Address::Family af )
@@ -303,35 +432,39 @@ bool GNet::StreamSocket::supports( Address::Family af )
 			first = false ;
 			if( !Address::supports(af) )
 				G_WARNING( "GNet::StreamSocket::supports: no ipv6 support built-in" ) ;
-			else if( !SocketBase::supports(Address(af,0U).domain(),SOCK_STREAM,0) )
+			else if( !SocketBase::supports(af,SOCK_STREAM,0) )
 				G_WARNING( "GNet::StreamSocket::supports: no ipv6 support detected" ) ;
 			else
 				result = true ;
 		}
 		return result ;
 	}
+	else if( af == Address::Family::local )
+	{
+		return Address::supports( af ) ;
+	}
 	else
 	{
-		return true ;
+		return true ; // ipv4 always supported
 	}
 }
 
-GNet::StreamSocket::StreamSocket( int address_domain ) :
-	Socket(address_domain,SOCK_STREAM,0)
+GNet::StreamSocket::StreamSocket( Address::Family af ) :
+	Socket(af,SOCK_STREAM,0)
 {
-	setOptionsOnCreate( false ) ;
+	setOptionsOnCreate( af , /*listener=*/false ) ;
 }
 
-GNet::StreamSocket::StreamSocket( int address_domain , const Listener & ) :
-	Socket(address_domain,SOCK_STREAM,0)
+GNet::StreamSocket::StreamSocket( Address::Family af , const Listener & ) :
+	Socket(af,SOCK_STREAM,0)
 {
-	setOptionsOnCreate( true ) ;
+	setOptionsOnCreate( af , /*listener=*/true ) ;
 }
 
-GNet::StreamSocket::StreamSocket( int domain , Descriptor s , const Socket::Accepted & accepted ) :
-	Socket(domain,s,accepted)
+GNet::StreamSocket::StreamSocket( Address::Family af , Descriptor s , const Accepted & accepted ) :
+	Socket(af,s,accepted)
 {
-	setOptionsOnAccept() ;
+	setOptionsOnAccept( af ) ;
 }
 
 GNet::Socket::ssize_type GNet::StreamSocket::read( char * buffer , size_type length )
@@ -369,20 +502,50 @@ GNet::AcceptPair GNet::StreamSocket::accept()
 	if( G::Test::enabled("socket-accept-throws") )
 		throw SocketError( "testing" ) ;
 
-	AcceptPair pair ;
-	pair.second = Address( addr ) ;
-	pair.first.reset( new StreamSocket( domain() , new_fd , Socket::Accepted() ) ) ; // 'new' for access
+	AcceptPair info ;
+	info.address = Address( addr ) ;
+	info.socket_ptr.reset( new StreamSocket( info.address.family() , new_fd , SocketBase::Accepted() ) ) ; // 'new' for access
 
 	G_DEBUG( "GNet::StreamSocket::accept: accepted from " << fd()
-		<< " to " << new_fd << " (" << pair.second.displayString() << ")" ) ;
+		<< " to " << new_fd << " (" << info.address.displayString() << ")" ) ;
 
-	return pair ;
+	return info ;
+}
+
+void GNet::StreamSocket::setOptionsOnCreate( Address::Family af , bool /*listener*/ )
+{
+	if( af == Address::Family::ipv4 || af == Address::Family::ipv6 )
+	{
+		using namespace StreamSocketImp ;
+		Options options ;
+		if( options.create_linger == Options::Linger::zero )
+			setOptionLingerImp( 1 , 0 ) ;
+		else if( options.create_linger == Options::Linger::nolinger )
+			setOptionNoLinger() ;
+		if( options.create_keepalive )
+			setOptionKeepAlive() ;
+	}
+}
+
+void GNet::StreamSocket::setOptionsOnAccept( Address::Family af )
+{
+	if( af == Address::Family::ipv4 || af == Address::Family::ipv6 )
+	{
+		using namespace StreamSocketImp ;
+		Options options ;
+		if( options.accept_linger == Options::Linger::zero )
+			setOptionLingerImp( 1 , 0 ) ;
+		else if( options.accept_linger == Options::Linger::nolinger )
+			setOptionNoLinger() ;
+		if( options.accept_keepalive )
+			setOptionKeepAlive() ;
+	}
 }
 
 //==
 
-GNet::DatagramSocket::DatagramSocket( int address_domain , int protocol ) :
-	Socket( address_domain , SOCK_DGRAM , protocol )
+GNet::DatagramSocket::DatagramSocket( Address::Family af , int protocol ) :
+	Socket( af , SOCK_DGRAM , protocol )
 {
 }
 
@@ -439,85 +602,3 @@ GNet::Socket::ssize_type GNet::DatagramSocket::write( const char * buffer , size
 	return writeImp( buffer , length ) ; // SocketBase
 }
 
-// ==
-
-void GNet::StreamSocket::setOptionsOnCreate( bool /*listener*/ )
-{
-	if( G::Test::enabled("socket-linger-zero") )
-		setOptionLingerImp( 1 , 0 ) ;
-	else if( G::Test::enabled("socket-linger-default") )
-		;
-	else
-		setOptionNoLinger() ;
-
-	if( G::Test::enabled("socket-keep-alive") )
-		setOptionKeepAlive() ;
-}
-
-void GNet::StreamSocket::setOptionsOnAccept()
-{
-	if( G::Test::enabled("socket-linger-zero") )
-		setOptionLingerImp( 1 , 0 ) ;
-	else if( G::Test::enabled("socket-linger-default") )
-		;
-	else
-		setOptionNoLinger() ;
-
-	if( G::Test::enabled("socket-keep-alive") )
-		setOptionKeepAlive() ;
-}
-
-void GNet::Socket::setOptionsOnConnect( bool ipv6 )
-{
-	setOptionPureV6( ipv6 , std::nothrow ) ; // ignore errors - may fail if already bound
-}
-
-void GNet::Socket::setOptionsOnBind( bool ipv6 )
-{
-	if( G::Test::enabled("socket-no-reuse") )
-		;
-	else
-		setOptionReuse() ; // allow us to rebind another socket's (eg. time-wait zombie's) address
-
-	//setOptionExclusive() ; // don't allow anyone else to bind our address
-	setOptionPureV6( ipv6 ) ;
-}
-
-void GNet::Socket::setOptionKeepAlive()
-{
-	setOption( SOL_SOCKET , "so_keepalive" , SO_KEEPALIVE , 1 ) ;
-}
-
-void GNet::Socket::setOptionNoLinger()
-{
-	setOptionLingerImp( 0 , 0 ) ;
-}
-
-void GNet::Socket::setOptionLingerImp( int onoff , int time )
-{
-	struct linger options {} ;
-	options.l_onoff = onoff ;
-	options.l_linger = time ;
-	bool ok = setOptionImp( SOL_SOCKET , SO_LINGER , &options , sizeof(options) ) ;
-	if( !ok )
-	{
-		saveReason() ;
-		throw SocketError( "cannot set no_linger" , reason() ) ;
-	}
-}
-
-bool GNet::Socket::setOption( int level , const char * , int op , int arg , std::nothrow_t )
-{
-	const void * const vp = static_cast<const void*>(&arg) ;
-	bool ok = setOptionImp( level , op , vp , sizeof(int) ) ;
-	if( !ok )
-		saveReason() ;
-	return ok ;
-}
-
-void GNet::Socket::setOption( int level , const char * opp , int op , int arg )
-{
-	if( !setOption( level , opp , op , arg , std::nothrow ) )
-		throw SocketError( opp , reason() ) ;
-}
-
diff --git a/src/gnet/gsocket.h b/src/gnet/gsocket.h
index b27b59b..8bf2a2d 100644
--- a/src/gnet/gsocket.h
+++ b/src/gnet/gsocket.h
@@ -24,10 +24,13 @@
 #include "gdef.h"
 #include "gaddress.h"
 #include "gexceptionsink.h"
+#include "gexception.h"
 #include "gevent.h"
 #include "gdescriptor.h"
 #include "greadwrite.h"
+#include "gstringview.h"
 #include <string>
+#include <memory>
 #include <new>
 
 namespace GNet
@@ -54,10 +57,12 @@ public:
 	G_EXCEPTION_CLASS( SocketTooMany , "socket accept error" ) ;
 	using size_type = G::ReadWrite::size_type ;
 	using ssize_type = G::ReadWrite::ssize_type ;
-	struct Accepted /// Overload discriminator class for GNet::Socket.
+	struct Accepted /// Overload discriminator class for GNet::SocketBase.
+		{} ;
+	struct Raw /// Overload discriminator class for GNet::SocketBase.
 		{} ;
 
-	static bool supports( int domain , int type , int protocol ) ;
+	static bool supports( Address::Family , int type , int protocol ) ;
 		///< Returns true if sockets can be created with the
 		///< given parameters.
 
@@ -66,12 +71,11 @@ public:
 		///< removed from the event loop.
 
 	SOCKET fd() const noexcept override ;
-		///< Returns the socket descriptor. Override from G::ReadWrite.
+		///< Returns the socket file descriptor.
 
 	bool eWouldBlock() const override ;
 		///< Returns true if the previous socket operation
 		///< failed because the socket would have blocked.
-		///< Override from G::ReadWrite.
 
 	bool eInProgress() const ;
 		///< Returns true if the previous socket operation
@@ -89,6 +93,10 @@ public:
 		///< Returns true if the previous socket operation
 		///< failed with the EMFILE error status, or similar.
 
+	bool eNotConn() const ;
+		///< Returns true if the previous socket operation
+		///< failed with the ENOTCONN error status, or similar.
+
 	void addReadHandler( EventHandler & , ExceptionSink ) ;
 		///< Adds this socket to the event source list so that
 		///< the given handler receives read events.
@@ -123,35 +131,56 @@ public:
 		///< Returns the reason for the previous error.
 
 protected:
-	SocketBase( int domain , int type , int protocol ) ;
+	SocketBase( Address::Family , int type , int protocol ) ;
 		///< Constructor used by derived classes. Creates the
-		///< socket using socket().
+		///< socket using socket() and makes it non-blocking.
 
-	SocketBase( int domain , Descriptor s , const Accepted & ) ;
-		///< Constructor which creates a socket object from
-		///< a socket handle from accept(). Used only by
-		///< StreamSocket::accept().
+	SocketBase( Address::Family , Descriptor s ) ;
+		///< Constructor used by derived classes. Creates the
+		///< socket object from a newly-created socket handle
+		///< and makes it non-blocking.
+
+	SocketBase( Address::Family , Descriptor s , const Accepted & ) ;
+		///< Constructor used by StreamSocket::accept() to create
+		///< a socket object from a newly accept()ed socket
+		///< handle.
+
+	SocketBase( const Raw & , int domain , int type , int protocol ) ;
+		///< Constructor for a raw socket.
 
 	ssize_type writeImp( const char * buf , size_type len ) ;
 		///< Writes to the socket. This is a default implementation
 		///< for write() that can be called from derived classes'
 		///< overrides.
 
-protected:
-	static std::string reasonString( int ) ;
 	static bool error( int rc ) ;
+		///< Returns true if the given return code indicates an
+		///< error.
+
 	static bool sizeError( ssize_type size ) ;
-	bool create( int , int , int ) ;
+		///< Returns true if the given write() return value
+		///< indicates an error.
+
 	void clearReason() ;
+		///< Clears the saved errno.
+
 	void saveReason() ;
+		///< Saves the current errno following error()/sizeError().
+
 	void saveReason() const ;
-	int domain() const ;
-	bool prepare( bool ) ;
+		///< Saves the current errno following error()/sizeError().
+
+	bool isFamily( Address::Family ) const ;
+		///< Returns true if the socket family is as given.
 
 private:
+	static std::string reasonString( int ) ;
+	bool create( int , int , int ) ;
+	bool prepare( bool ) ;
 	void drop() noexcept ;
 	void destroy() noexcept ;
-	bool setNonBlock() ;
+	void unlink() noexcept ;
+	bool setNonBlocking() ;
 
 public:
 	SocketBase( const SocketBase & ) = delete ;
@@ -161,30 +190,28 @@ public:
 
 private:
 	int m_reason ;
-	std::string m_reason_string ;
 	int m_domain ;
+	Address::Family m_family ; // valid depending on m_domain
 	Descriptor m_fd ;
+	bool m_added ;
+	bool m_accepted ;
 } ;
 
 //| \class GNet::Socket
 /// An internet-protocol socket class. Provides bind(), listen(),
-/// and connect(); the base class provide write(); and derived
+/// and connect(); the base classes provide write(); and derived
 /// classes provide accept() and read().
 ///
 class GNet::Socket : public SocketBase
 {
 public:
-	std::pair<bool,Address> getLocalAddress() const ;
+	Address getLocalAddress() const ;
 		///< Retrieves local address of the socket.
-		///< The boolean value is false on error.
 
 	std::pair<bool,Address> getPeerAddress() const ;
 		///< Retrieves address of socket's peer.
-		///< The boolean value is false on error.
-
-	bool hasPeer() const ;
-		///< Returns true if the socket has a valid peer. This
-		///< can be used to see if a connect succeeded.
+		///< Returns false in 'first' if none, ie. not yet
+		///< connected.
 
 	void bind( const Address & ) ;
 		///< Binds the socket with the given address.
@@ -192,12 +219,11 @@ public:
 	bool bind( const Address & , std::nothrow_t ) ;
 		///< No-throw overload. Returns false on error.
 
-	bool canBindHint( const Address & address ) ;
-		///< Returns true if the socket can probably be bound
-		///< with the given address. Some implementations will
-		///< always return true. This method should be used on
-		///< a temporary socket of the correct dynamic type
-		///< since this socket may become unusable.
+	static std::string canBindHint( const Address & address , bool stream_socket = true ) ;
+		///< Returns the empty string if a socket could probably be
+		///< bound with the given address or a failure reason.
+		///< Some implementations will always return the empty
+		///< string.
 
 	unsigned long getBoundScopeId() const ;
 		///< Returns the scope-id of the address last successfully
@@ -246,20 +272,20 @@ public:
 	void operator=( Socket && ) = delete ;
 
 protected:
-	Socket( int domain , int type , int protocol ) ;
-	Socket( int domain , Descriptor s , const Accepted & ) ;
-	std::pair<bool,Address> getAddress( bool ) const ;
+	Socket( Address::Family , int type , int protocol ) ;
+	Socket( Address::Family , Descriptor s , const Accepted & ) ;
+	std::pair<bool,Address> getLocalAddress( std::nothrow_t ) const ;
 	void setOption( int , const char * , int , int ) ;
 	bool setOption( int , const char * , int , int , std::nothrow_t ) ;
 	bool setOptionImp( int , int , const void * , socklen_t ) ;
-	void setOptionsOnBind( bool ) ;
-	void setOptionsOnConnect( bool ) ;
+	void setOptionsOnBind( Address::Family ) ;
+	void setOptionsOnConnect( Address::Family ) ;
 	void setOptionLingerImp( int , int ) ;
 	void setOptionNoLinger() ;
 	void setOptionReuse() ;
 	void setOptionExclusive() ;
-	void setOptionPureV6( bool ) ;
-	bool setOptionPureV6( bool , std::nothrow_t ) ;
+	void setOptionPureV6() ;
+	bool setOptionPureV6( std::nothrow_t ) ;
 	void setOptionKeepAlive() ;
 
 private:
@@ -267,15 +293,15 @@ private:
 } ;
 
 //| \class GNet::AcceptPair
-/// A class which is used to return a new()ed socket to calling code, together
-/// with associated address information.
+/// A class which is used to return a new()ed socket to calling
+/// code, together with associated address information.
 ///
 class GNet::AcceptPair
 {
 public:
-	std::shared_ptr<StreamSocket> first ;
-	Address second ;
-	AcceptPair() : second(Address::defaultAddress()) {}
+	std::shared_ptr<StreamSocket> socket_ptr ;
+	Address address ;
+	AcceptPair() : address(Address::defaultAddress()) {}
 } ;
 
 //| \class GNet::StreamSocket
@@ -296,12 +322,13 @@ public:
 		///< Note that a run-time check is useful when running a
 		///< new binary on an old operating system.
 
-	explicit StreamSocket( int address_domain ) ;
+	explicit StreamSocket( Address::Family ) ;
 		///< Constructor.
 
-	StreamSocket( int address_domain , const Listener & ) ;
+	StreamSocket( Address::Family , const Listener & ) ;
 		///< Constructor overload specifically for a listening
-		///< socket. This can be used modify the socket options.
+		///< socket, which might need slightly different socket
+		///< options.
 
 	ssize_type read( char * buffer , size_type buffer_length ) override ;
 		///< Override from ReadWrite::read().
@@ -321,9 +348,9 @@ public:
 	void operator=( StreamSocket && ) = delete ;
 
 private:
-	StreamSocket( int , Descriptor s , const Socket::Accepted & ) ;
-	void setOptionsOnCreate( bool ) ;
-	void setOptionsOnAccept() ;
+	StreamSocket( Address::Family , Descriptor s , const Accepted & ) ;
+	void setOptionsOnCreate( Address::Family , bool listener ) ;
+	void setOptionsOnAccept( Address::Family ) ;
 } ;
 
 //| \class GNet::DatagramSocket
@@ -332,7 +359,7 @@ private:
 class GNet::DatagramSocket : public Socket
 {
 public:
-	explicit DatagramSocket( int address_domain , int protocol = 0 ) ;
+	explicit DatagramSocket( Address::Family , int protocol = 0 ) ;
 		///< Constructor.
 
 	ssize_type read( char * buffer , size_type len ) override ;
@@ -363,12 +390,13 @@ public:
 } ;
 
 //| \class GNet::RawSocket
-/// A derivation of GNet::SocketBase for a raw socket.
+/// A derivation of GNet::SocketBase for a raw socket, typically of
+/// type AF_NETLINK or PF_ROUTE.
 ///
 class GNet::RawSocket : public SocketBase
 {
 public:
-	explicit RawSocket( int domain , int protocol = 0 ) ;
+	RawSocket( int domain , int type , int protocol ) ;
 		///< Constructor.
 
 	ssize_type read( char * buffer , size_type buffer_length ) override ;
diff --git a/src/gnet/gsocket_unix.cpp b/src/gnet/gsocket_unix.cpp
index 2653c17..6faaa85 100644
--- a/src/gnet/gsocket_unix.cpp
+++ b/src/gnet/gsocket_unix.cpp
@@ -23,6 +23,7 @@
 #include "gmsg.h"
 #include "gprocess.h"
 #include "gstr.h"
+#include "gfile.h"
 #include "gcleanup.h"
 #include "glog.h"
 #include <cerrno> // EWOULDBLOCK etc
@@ -30,9 +31,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-bool GNet::SocketBase::supports( int domain , int type , int protocol )
+bool GNet::SocketBase::supports( Address::Family af , int type , int protocol )
 {
-	int fd = ::socket( domain , type , protocol ) ;
+	int fd = ::socket( Address::domain(af) , type , protocol ) ;
 	if( fd < 0 )
 		return false ;
 	::close( fd ) ;
@@ -59,7 +60,7 @@ bool GNet::SocketBase::prepare( bool /*accepted*/ )
 		G::Cleanup::init() ; // ignore SIGPIPE
 	}
 
-	if( !setNonBlock() )
+	if( !setNonBlocking() )
 	{
 		saveReason() ;
 		return false ;
@@ -69,9 +70,28 @@ bool GNet::SocketBase::prepare( bool /*accepted*/ )
 
 void GNet::SocketBase::destroy() noexcept
 {
+	if( m_domain == PF_UNIX && !m_accepted ) unlink() ;
 	::close( m_fd.fd() ) ;
 }
 
+void GNet::SocketBase::unlink() noexcept
+{
+	try
+	{
+		AddressStorage address_storage ;
+		int rc = ::getsockname( m_fd.fd() , address_storage.p1() , address_storage.p2() ) ;
+		std::string path = rc == 0 ? Address(address_storage).hostPartString() : std::string() ;
+		if( !path.empty() && path.at(0U) == '/' )
+		{
+			G_DEBUG( "GNet::SocketBase::unlink: deleting unix-domain socket: fd=" << m_fd.fd() << " path=[" << G::Str::printable(path) << "]" ) ;
+			G::File::remove( path , std::nothrow ) ; // best-effort -- see also G::Root
+		}
+	}
+	catch(...)
+	{
+	}
+}
+
 bool GNet::SocketBase::error( int rc )
 {
 	return rc < 0 ;
@@ -80,16 +100,15 @@ bool GNet::SocketBase::error( int rc )
 void GNet::SocketBase::saveReason()
 {
 	m_reason = G::Process::errno_() ;
-	m_reason_string = reasonString( m_reason ) ;
 }
 
-bool GNet::SocketBase::setNonBlock()
+bool GNet::SocketBase::setNonBlocking()
 {
-	int mode = ::fcntl( m_fd.fd() , F_GETFL ) ;
+	int mode = ::fcntl( m_fd.fd() , F_GETFL ) ; // NOLINT
 	if( mode < 0 )
 		return false ;
 
-	int rc = ::fcntl( m_fd.fd() , F_SETFL , mode | O_NONBLOCK ) ;
+	int rc = ::fcntl( m_fd.fd() , F_SETFL , mode | O_NONBLOCK ) ; // NOLINT
 	return rc == 0 ;
 }
 
@@ -98,6 +117,11 @@ bool GNet::SocketBase::sizeError( ssize_t size )
 	return size < 0 ;
 }
 
+bool GNet::SocketBase::eNotConn() const
+{
+	return m_reason == ENOTCONN ;
+}
+
 bool GNet::SocketBase::eWouldBlock() const
 {
 	return m_reason == EWOULDBLOCK || m_reason == EAGAIN || m_reason == EINTR ;
@@ -120,14 +144,30 @@ bool GNet::SocketBase::eTooMany() const
 
 std::string GNet::SocketBase::reasonString( int e )
 {
-	return G::Str::lower(G::Process::strerror(e)) ;
+	return G::Process::strerror( e ) ;
 }
 
 // ==
 
-bool GNet::Socket::canBindHint( const Address & address )
+std::string GNet::Socket::canBindHint( const Address & address , bool stream )
 {
-	return bind( address , std::nothrow ) ;
+	if( address.family() == Address::Family::ipv4 || address.family() == Address::Family::ipv6 )
+	{
+		if( stream )
+		{
+			StreamSocket s( address.family() ) ;
+			return s.bind( address , std::nothrow ) ? std::string() : s.reason() ;
+		}
+		else
+		{
+			DatagramSocket s( address.family() ) ;
+			return s.bind( address , std::nothrow ) ? std::string() : s.reason() ;
+		}
+	}
+	else
+	{
+		return {} ; // could do better
+	}
 }
 
 void GNet::Socket::setOptionReuse()
@@ -141,23 +181,19 @@ void GNet::Socket::setOptionExclusive()
 	// no-op
 }
 
-void GNet::Socket::setOptionPureV6( bool active )
+void GNet::Socket::setOptionPureV6()
 {
 	#if GCONFIG_HAVE_IPV6
-		if( active )
-			setOption( IPPROTO_IPV6 , "ipv6_v6only" , IPV6_V6ONLY , 1 ) ;
+		setOption( IPPROTO_IPV6 , "ipv6_v6only" , IPV6_V6ONLY , 1 ) ;
 	#else
-		if( active )
-			throw SocketError( "cannot set socket option for pure ipv6" ) ;
+		throw SocketError( "cannot set socket option for pure ipv6" ) ;
 	#endif
 }
 
-bool GNet::Socket::setOptionPureV6( bool active , std::nothrow_t )
+bool GNet::Socket::setOptionPureV6( std::nothrow_t )
 {
 	#if GCONFIG_HAVE_IPV6
-		return active ? setOption( IPPROTO_IPV6 , "ipv6_v6only" , IPV6_V6ONLY , 1 , std::nothrow ) : true ;
-	#else
-		return !active ;
+		return setOption( IPPROTO_IPV6 , "ipv6_v6only" , IPV6_V6ONLY , 1 , std::nothrow ) ;
 	#endif
 }
 
@@ -169,8 +205,8 @@ bool GNet::Socket::setOptionImp( int level , int op , const void * arg , socklen
 
 // ==
 
-GNet::RawSocket::RawSocket( int domain , int protocol ) :
-	SocketBase(domain,SOCK_RAW,protocol)
+GNet::RawSocket::RawSocket( int domain , int type , int protocol ) :
+	SocketBase(SocketBase::Raw(),domain,type,protocol)
 {
 }
 
diff --git a/src/gnet/gsocket_win32.cpp b/src/gnet/gsocket_win32.cpp
index 59e87b4..ffe5222 100644
--- a/src/gnet/gsocket_win32.cpp
+++ b/src/gnet/gsocket_win32.cpp
@@ -20,14 +20,14 @@
 
 #include "gdef.h"
 #include "gsocket.h"
-#include "gconvert.h"
+#include "gprocess.h"
 #include "gstr.h"
 #include "gassert.h"
 #include <errno.h>
 
-bool GNet::SocketBase::supports( int domain , int type , int protocol )
+bool GNet::SocketBase::supports( Address::Family af , int type , int protocol )
 {
-	SOCKET fd = ::socket( domain , type , protocol ) ;
+	SOCKET fd = ::socket( Address::domain(af) , type , protocol ) ;
 	if( fd == INVALID_SOCKET )
 		return false ;
 	::closesocket( fd ) ;
@@ -58,11 +58,16 @@ bool GNet::SocketBase::prepare( bool accepted )
 	if( accepted )
 	{
 		G_ASSERT( m_fd.h() == HNULL ) ;
-		HANDLE h = WSACreateEvent() ; // handle errors in the event loop
+		HANDLE h = WSACreateEvent() ;
+		if( h == HNULL )
+		{
+			saveReason() ;
+			return false ;
+		}
 		m_fd = Descriptor( m_fd.fd() , h ) ;
 	}
 
-	if( !setNonBlock() )
+	if( !setNonBlocking() )
 	{
 		saveReason() ;
 		return false ;
@@ -87,7 +92,6 @@ bool GNet::SocketBase::error( int rc )
 void GNet::SocketBase::saveReason()
 {
 	m_reason = WSAGetLastError() ;
-	m_reason_string = reasonString( m_reason ) ;
 }
 
 bool GNet::SocketBase::sizeError( ssize_t size )
@@ -95,6 +99,11 @@ bool GNet::SocketBase::sizeError( ssize_t size )
 	return size == SOCKET_ERROR ;
 }
 
+bool GNet::SocketBase::eNotConn() const
+{
+	return m_reason == WSAENOTCONN ;
+}
+
 bool GNet::SocketBase::eWouldBlock() const
 {
 	return m_reason == WSAEWOULDBLOCK ;
@@ -115,7 +124,7 @@ bool GNet::SocketBase::eTooMany() const
 	return m_reason == WSAEMFILE ; // or WSAENOBUFS ?
 }
 
-bool GNet::SocketBase::setNonBlock()
+bool GNet::SocketBase::setNonBlocking()
 {
 	unsigned long ul = 1 ;
 	return ioctlsocket( m_fd.fd() , FIONBIO , &ul ) != SOCKET_ERROR ;
@@ -123,50 +132,14 @@ bool GNet::SocketBase::setNonBlock()
 
 std::string GNet::SocketBase::reasonString( int e )
 {
-	//if( e == WSANOTINITIALISED )
-	if( e == WSAENETDOWN ) return "network down" ;
-	//if( e == WSAEFAULT )
-	//if( e == WSAENOTCONN )
-	//if( e == WSAEINTR )
-	//if( e == WSAEINPROGRESS )
-	if( e == WSAENETRESET ) return "network reset" ;
-	//if( e == WSAENOTSOCK )
-	//if( e == WSAEOPNOTSUPP )
-	if( e == WSAESHUTDOWN ) return "already shut down" ;
-	//if( e == WSAEWOULDBLOCK )
-	//if( e == WSAEMSGSIZE )
-	//if( e == WSAEINVAL )
-	if( e == WSAECONNABORTED ) return "aborted" ;
-	if( e == WSAETIMEDOUT ) return "timed out" ;
-	if( e == WSAECONNRESET ) return "connection reset by peer" ;
-
-	std::string result = "unknown error" ;
-	DWORD size_limit = 128U ;
-	TCHAR * buffer = nullptr ;
-	DWORD flags = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS ;
-	DWORD rc = FormatMessage( flags , nullptr , e , 0 , reinterpret_cast<LPSTR>(&buffer) , size_limit , nullptr ) ;
-	if( buffer == nullptr || rc == 0U ) return result ;
-	G::Convert::tstring tmessage( buffer , static_cast<std::size_t>(rc) ) ;
-	::LocalFree( buffer ) ;
-	try
-	{
-		G::Convert::convert( result , tmessage , G::Convert::ThrowOnError() ) ;
-	}
-	catch( G::Convert::Error & )
-	{
-	}
-	G::Str::removeAll( result , '\r' ) ;
-	G::Str::trimRight( result , ".\n" ) ;
-	G::Str::replaceAll( result , "\n" , " " ) ;
-	G_DEBUG( "GNet::SocketBase::reasonString: " << e << " -> [" << G::Str::printable(result) << "]" ) ;
-	return G::Str::lower(G::Str::printable(result)) ;
+	return G::Process::strerror( e ) ;
 }
 
 // ==
 
-bool GNet::Socket::canBindHint( const Address & )
+std::string GNet::Socket::canBindHint( const Address & , bool )
 {
-	return true ; // rebinding the same port number fails, so a dummy implementation here
+	return std::string() ; // rebinding the same port number fails, so a dummy implementation here
 }
 
 void GNet::Socket::setOptionReuse()
@@ -179,12 +152,12 @@ void GNet::Socket::setOptionExclusive()
 	setOption( SOL_SOCKET , "so_exclusiveaddruse" , SO_EXCLUSIVEADDRUSE , 1 ) ;
 }
 
-void GNet::Socket::setOptionPureV6( bool )
+void GNet::Socket::setOptionPureV6()
 {
 	// no-op
 }
 
-bool GNet::Socket::setOptionPureV6( bool , std::nothrow_t )
+bool GNet::Socket::setOptionPureV6( std::nothrow_t )
 {
 	return true ; // no-op
 }
diff --git a/src/gnet/gsocketprotocol.cpp b/src/gnet/gsocketprotocol.cpp
index c75a5f5..295fb08 100644
--- a/src/gnet/gsocketprotocol.cpp
+++ b/src/gnet/gsocketprotocol.cpp
@@ -293,7 +293,7 @@ bool GNet::SocketProtocolImp::send( const std::string & data , std::size_t offse
 
 bool GNet::SocketProtocolImp::send( const Segments & segments , std::size_t offset )
 {
-	if( segments.empty() || size(segments) == 0U )
+	if( segments.empty() || size(segments) == 0U || offset >= size(segments) )
 		return true ;
 
 	bool rc = true ;
diff --git a/src/gnet/gtimerlist.cpp b/src/gnet/gtimerlist.cpp
index 16f1bc9..fdf2db7 100644
--- a/src/gnet/gtimerlist.cpp
+++ b/src/gnet/gtimerlist.cpp
@@ -121,6 +121,9 @@ void GNet::TimerList::updateOnStart( TimerBase & timer )
 	if( timer.immediate() )
 		timer.adjust( m_adjust++ ) ; // well-defined t() order for immediate timers
 
+	if( m_soonest == &timer )
+		m_soonest = nullptr ;
+
 	if( m_soonest != nullptr && timer.t() < m_soonest->t() )
 		m_soonest = &timer ;
 }
diff --git a/src/gpop/Makefile.in b/src/gpop/Makefile.in
index b2dd26a..7727aae 100644
--- a/src/gpop/Makefile.in
+++ b/src/gpop/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -126,9 +126,11 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gpopserver.Po \
+	./$(DEPDIR)/gpopserverprotocol.Po ./$(DEPDIR)/gpopstore.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -245,6 +247,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -281,6 +284,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -346,8 +350,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -373,9 +377,15 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopserverprotocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopstore.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopserverprotocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpopstore.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -443,7 +453,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -512,7 +525,9 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gpopserver.Po
+	-rm -f ./$(DEPDIR)/gpopserverprotocol.Po
+	-rm -f ./$(DEPDIR)/gpopstore.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -558,7 +573,9 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gpopserver.Po
+	-rm -f ./$(DEPDIR)/gpopserverprotocol.Po
+	-rm -f ./$(DEPDIR)/gpopstore.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -578,18 +595,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/gpop/gpopserver.cpp b/src/gpop/gpopserver.cpp
index 2952fd9..bd0586f 100644
--- a/src/gpop/gpopserver.cpp
+++ b/src/gpop/gpopserver.cpp
@@ -84,7 +84,7 @@ void GPop::ServerPeer::onSecure( const std::string & , const std::string & , con
 // ===
 
 GPop::Server::Server( GNet::ExceptionSink es , Store & store , const GAuth::SaslServerSecrets & secrets , const Config & config ) :
-	GNet::MultiServer(es,config.addresses,config.port,"pop",config.server_peer_config) ,
+	GNet::MultiServer(es,config.addresses,config.port,"pop",config.server_peer_config,config.server_config) ,
 	m_config(config) ,
 	m_store(store) ,
 	m_secrets(secrets)
@@ -138,11 +138,13 @@ GPop::Server::Config::Config() :
 }
 
 GPop::Server::Config::Config( bool allow_remote_ , unsigned int port_ , const G::StringArray & addresses_ ,
-	const GNet::ServerPeerConfig & server_peer_config_ , const std::string & sasl_server_config_ ) :
+	const GNet::ServerPeerConfig & server_peer_config_ , const GNet::ServerConfig & server_config_ ,
+	const std::string & sasl_server_config_ ) :
 		allow_remote(allow_remote_) ,
 		port(port_) ,
 		addresses(addresses_) ,
 		server_peer_config(server_peer_config_) ,
+		server_config(server_config_) ,
 		sasl_server_config(sasl_server_config_)
 {
 }
diff --git a/src/gpop/gpopserver.h b/src/gpop/gpopserver.h
index 7810bf4..0c5f4b3 100644
--- a/src/gpop/gpopserver.h
+++ b/src/gpop/gpopserver.h
@@ -91,15 +91,18 @@ public:
 		unsigned int port{110} ;
 		G::StringArray addresses ;
 		GNet::ServerPeerConfig server_peer_config ;
+		GNet::ServerConfig server_config ;
 		std::string sasl_server_config ;
 
 		Config() ;
 		Config( bool , unsigned int port , const G::StringArray & addresses ,
-			const GNet::ServerPeerConfig & , const std::string & sasl_server_config ) ;
+			const GNet::ServerPeerConfig & , const GNet::ServerConfig & ,
+			const std::string & sasl_server_config ) ;
 		Config & set_allow_remote( bool = true ) ;
 		Config & set_port( unsigned int ) ;
 		Config & set_addresses( const G::StringArray & ) ;
 		Config & set_server_peer_config( const GNet::ServerPeerConfig & ) ;
+		Config & set_server_config( const GNet::ServerConfig & ) ;
 		Config & set_sasl_server_config( const std::string & ) ;
 	} ;
 
@@ -134,6 +137,7 @@ inline GPop::Server::Config & GPop::Server::Config::set_allow_remote( bool b ) {
 inline GPop::Server::Config & GPop::Server::Config::set_port( unsigned int p ) { port = p ; return *this ; }
 inline GPop::Server::Config & GPop::Server::Config::set_addresses( const G::StringArray & a ) { addresses = a ; return *this ; }
 inline GPop::Server::Config & GPop::Server::Config::set_server_peer_config( const GNet::ServerPeerConfig & c ) { server_peer_config = c ; return *this ; }
+inline GPop::Server::Config & GPop::Server::Config::set_server_config( const GNet::ServerConfig & c ) { server_config = c ; return *this ; }
 inline GPop::Server::Config & GPop::Server::Config::set_sasl_server_config( const std::string & s ) { sasl_server_config = s ; return *this ; }
 
 #endif
diff --git a/src/gpop/gpopserverprotocol.cpp b/src/gpop/gpopserverprotocol.cpp
index 5687bf0..08bbe57 100644
--- a/src/gpop/gpopserverprotocol.cpp
+++ b/src/gpop/gpopserverprotocol.cpp
@@ -623,7 +623,7 @@ void GPop::ServerProtocol::sendLines( std::ostringstream & ss )
 		const std::size_t npos = std::string::npos ;
 		std::size_t p0 = 0U ;
 		std::size_t p1 = s.find( '\n' ) ;
-		for( size_t i = 0U ; i < lines ; i++ , p0 = p1+1U , p1 = s.find('\n',p0+1U) )
+		for( std::size_t i = 0U ; i < lines ; i++ , p0 = p1+1U , p1 = s.find('\n',p0+1U) )
 		{
 			G_ASSERT( p0 != npos && p0 < s.size() ) ;
 			std::size_t n = p1 == npos ? (s.size()-p0) : (p1-p0) ;
diff --git a/src/gsmtp/Makefile.in b/src/gsmtp/Makefile.in
index b9f8423..1455e7d 100644
--- a/src/gsmtp/Makefile.in
+++ b/src/gsmtp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -163,9 +163,28 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gadminserver.Po \
+	./$(DEPDIR)/genvelope.Po ./$(DEPDIR)/gexecutablefilter.Po \
+	./$(DEPDIR)/gexecutableverifier.Po \
+	./$(DEPDIR)/gfactoryparser.Po ./$(DEPDIR)/gfilestore.Po \
+	./$(DEPDIR)/gfilter.Po ./$(DEPDIR)/gfilterfactory.Po \
+	./$(DEPDIR)/ginternalverifier.Po ./$(DEPDIR)/gmessagestore.Po \
+	./$(DEPDIR)/gmessagestore_unix.Po \
+	./$(DEPDIR)/gmessagestore_win32.Po \
+	./$(DEPDIR)/gnetworkfilter.Po ./$(DEPDIR)/gnetworkverifier.Po \
+	./$(DEPDIR)/gnewfile.Po ./$(DEPDIR)/gnewmessage.Po \
+	./$(DEPDIR)/gnullfilter.Po ./$(DEPDIR)/gprotocolmessage.Po \
+	./$(DEPDIR)/gprotocolmessageforward.Po \
+	./$(DEPDIR)/gprotocolmessagestore.Po \
+	./$(DEPDIR)/grequestclient.Po ./$(DEPDIR)/gsmtpclient.Po \
+	./$(DEPDIR)/gsmtpclientprotocol.Po ./$(DEPDIR)/gsmtpserver.Po \
+	./$(DEPDIR)/gsmtpserverprotocol.Po ./$(DEPDIR)/gspamclient.Po \
+	./$(DEPDIR)/gspamfilter.Po ./$(DEPDIR)/gstoredfile.Po \
+	./$(DEPDIR)/gstoredmessage.Po ./$(DEPDIR)/gverifier.Po \
+	./$(DEPDIR)/gverifierfactory.Po ./$(DEPDIR)/gverifierstatus.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -282,6 +301,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -318,6 +338,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -448,8 +469,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -475,38 +496,44 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gadminserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvelope.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablefilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutableverifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfactoryparser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilestore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilterfactory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginternalverifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetworkfilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetworkverifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewmessage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnullfilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessageforward.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessagestore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grequestclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclientprotocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpserver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpserverprotocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gspamclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gspamfilter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredmessage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifierfactory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifierstatus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gadminserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genvelope.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutablefilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexecutableverifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfactoryparser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfilterfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginternalverifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmessagestore_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetworkfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnetworkverifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnewmessage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnullfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessageforward.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gprotocolmessagestore.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grequestclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpclientprotocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpserver.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsmtpserverprotocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gspamclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gspamfilter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstoredmessage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifierfactory.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gverifierstatus.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -574,7 +601,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -643,7 +673,38 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gadminserver.Po
+	-rm -f ./$(DEPDIR)/genvelope.Po
+	-rm -f ./$(DEPDIR)/gexecutablefilter.Po
+	-rm -f ./$(DEPDIR)/gexecutableverifier.Po
+	-rm -f ./$(DEPDIR)/gfactoryparser.Po
+	-rm -f ./$(DEPDIR)/gfilestore.Po
+	-rm -f ./$(DEPDIR)/gfilter.Po
+	-rm -f ./$(DEPDIR)/gfilterfactory.Po
+	-rm -f ./$(DEPDIR)/ginternalverifier.Po
+	-rm -f ./$(DEPDIR)/gmessagestore.Po
+	-rm -f ./$(DEPDIR)/gmessagestore_unix.Po
+	-rm -f ./$(DEPDIR)/gmessagestore_win32.Po
+	-rm -f ./$(DEPDIR)/gnetworkfilter.Po
+	-rm -f ./$(DEPDIR)/gnetworkverifier.Po
+	-rm -f ./$(DEPDIR)/gnewfile.Po
+	-rm -f ./$(DEPDIR)/gnewmessage.Po
+	-rm -f ./$(DEPDIR)/gnullfilter.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessage.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessageforward.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessagestore.Po
+	-rm -f ./$(DEPDIR)/grequestclient.Po
+	-rm -f ./$(DEPDIR)/gsmtpclient.Po
+	-rm -f ./$(DEPDIR)/gsmtpclientprotocol.Po
+	-rm -f ./$(DEPDIR)/gsmtpserver.Po
+	-rm -f ./$(DEPDIR)/gsmtpserverprotocol.Po
+	-rm -f ./$(DEPDIR)/gspamclient.Po
+	-rm -f ./$(DEPDIR)/gspamfilter.Po
+	-rm -f ./$(DEPDIR)/gstoredfile.Po
+	-rm -f ./$(DEPDIR)/gstoredmessage.Po
+	-rm -f ./$(DEPDIR)/gverifier.Po
+	-rm -f ./$(DEPDIR)/gverifierfactory.Po
+	-rm -f ./$(DEPDIR)/gverifierstatus.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -689,7 +750,38 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gadminserver.Po
+	-rm -f ./$(DEPDIR)/genvelope.Po
+	-rm -f ./$(DEPDIR)/gexecutablefilter.Po
+	-rm -f ./$(DEPDIR)/gexecutableverifier.Po
+	-rm -f ./$(DEPDIR)/gfactoryparser.Po
+	-rm -f ./$(DEPDIR)/gfilestore.Po
+	-rm -f ./$(DEPDIR)/gfilter.Po
+	-rm -f ./$(DEPDIR)/gfilterfactory.Po
+	-rm -f ./$(DEPDIR)/ginternalverifier.Po
+	-rm -f ./$(DEPDIR)/gmessagestore.Po
+	-rm -f ./$(DEPDIR)/gmessagestore_unix.Po
+	-rm -f ./$(DEPDIR)/gmessagestore_win32.Po
+	-rm -f ./$(DEPDIR)/gnetworkfilter.Po
+	-rm -f ./$(DEPDIR)/gnetworkverifier.Po
+	-rm -f ./$(DEPDIR)/gnewfile.Po
+	-rm -f ./$(DEPDIR)/gnewmessage.Po
+	-rm -f ./$(DEPDIR)/gnullfilter.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessage.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessageforward.Po
+	-rm -f ./$(DEPDIR)/gprotocolmessagestore.Po
+	-rm -f ./$(DEPDIR)/grequestclient.Po
+	-rm -f ./$(DEPDIR)/gsmtpclient.Po
+	-rm -f ./$(DEPDIR)/gsmtpclientprotocol.Po
+	-rm -f ./$(DEPDIR)/gsmtpserver.Po
+	-rm -f ./$(DEPDIR)/gsmtpserverprotocol.Po
+	-rm -f ./$(DEPDIR)/gspamclient.Po
+	-rm -f ./$(DEPDIR)/gspamfilter.Po
+	-rm -f ./$(DEPDIR)/gstoredfile.Po
+	-rm -f ./$(DEPDIR)/gstoredmessage.Po
+	-rm -f ./$(DEPDIR)/gverifier.Po
+	-rm -f ./$(DEPDIR)/gverifierfactory.Po
+	-rm -f ./$(DEPDIR)/gverifierstatus.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -709,18 +801,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/gsmtp/gadminserver.cpp b/src/gsmtp/gadminserver.cpp
index 6b953d0..93155a1 100644
--- a/src/gsmtp/gadminserver.cpp
+++ b/src/gsmtp/gadminserver.cpp
@@ -82,6 +82,10 @@ bool GSmtp::AdminServerPeer::onReceive( const char * line_data , std::size_t lin
 	{
 		flush() ;
 	}
+	else if( is(line,"forward") )
+	{
+		forward() ;
+	}
 	else if( is(line,"help") )
 	{
 		help() ;
@@ -185,6 +189,7 @@ void GSmtp::AdminServerPeer::help()
 {
 	std::set<std::string> commands ;
 	commands.insert( "flush" ) ;
+	commands.insert( "forward" ) ;
 	commands.insert( "help" ) ;
 	commands.insert( "status" ) ;
 	commands.insert( "list" ) ;
@@ -224,6 +229,19 @@ void GSmtp::AdminServerPeer::flush()
 	}
 }
 
+void GSmtp::AdminServerPeer::forward()
+{
+	if( m_remote_address.empty() )
+	{
+		sendLine( "error: no remote server configured: use --forward-to" ) ;
+	}
+	else
+	{
+		m_server.forward() ;
+		sendLine( "OK" ) ;
+	}
+}
+
 void GSmtp::AdminServerPeer::sendLine( std::string line , bool with_prompt )
 {
 	if( !line.empty() )
@@ -322,14 +340,17 @@ bool GSmtp::AdminServerPeer::notifying() const
 // ===
 
 GSmtp::AdminServer::AdminServer( GNet::ExceptionSink es , MessageStore & store ,
-	const GNet::ServerPeerConfig & server_peer_config ,
+	G::Slot::Signal<const std::string&> & forward_request ,
+	const GNet::ServerPeerConfig & server_peer_config , const GNet::ServerConfig & server_config ,
 	const GSmtp::Client::Config & client_config , const GAuth::Secrets & client_secrets ,
 	const G::StringArray & interfaces , unsigned int port , bool allow_remote ,
 	const std::string & remote_address , unsigned int connection_timeout ,
 	const G::StringMap & info_commands , const G::StringMap & config_commands ,
 	bool with_terminate ) :
-		GNet::MultiServer(es,interfaces,port,"admin",server_peer_config) ,
+		GNet::MultiServer(es,interfaces,port,"admin",server_peer_config,server_config) ,
+		m_forward_timer(*this,&AdminServer::onForwardTimeout,es) ,
 		m_store(store) ,
+		m_forward_request(forward_request) ,
 		m_client_config(client_config) ,
 		m_client_secrets(client_secrets) ,
 		m_allow_remote(allow_remote) ,
@@ -369,6 +390,23 @@ std::unique_ptr<GNet::ServerPeer> GSmtp::AdminServer::newPeer( GNet::ExceptionSi
 	}
 	return ptr ;
 }
+void GSmtp::AdminServer::forward()
+{
+	// asychronous emit() for safety
+	m_forward_timer.startTimer( 0 ) ;
+}
+
+void GSmtp::AdminServer::onForwardTimeout()
+{
+	try
+	{
+		m_forward_request.emit( std::string("admin") ) ;
+	}
+	catch( std::exception & e )
+	{
+		G_WARNING( "GSmtp::AdminServer: exception: " << e.what() ) ;
+	}
+}
 
 void GSmtp::AdminServer::report() const
 {
diff --git a/src/gsmtp/gadminserver.h b/src/gsmtp/gadminserver.h
index 4abf41b..2774d69 100644
--- a/src/gsmtp/gadminserver.h
+++ b/src/gsmtp/gadminserver.h
@@ -23,6 +23,7 @@
 
 #include "gdef.h"
 #include "gmultiserver.h"
+#include "gtimer.h"
 #include "gstr.h"
 #include "glinebuffer.h"
 #include "gsmtpserverprotocol.h"
@@ -32,6 +33,7 @@
 #include <list>
 #include <sstream>
 #include <utility>
+#include <memory>
 
 namespace GSmtp
 {
@@ -84,6 +86,7 @@ private:
 	static std::pair<bool,std::string> find( const std::string & line , const G::StringMap & map ) ;
 	static std::string argument( const std::string & ) ;
 	void flush() ;
+	void forward() ;
 	void help() ;
 	void status() ;
 	std::shared_ptr<MessageStore::Iterator> spooled() ;
@@ -117,7 +120,8 @@ class GSmtp::AdminServer : public GNet::MultiServer
 {
 public:
 	AdminServer( GNet::ExceptionSink , MessageStore & store ,
-		const GNet::ServerPeerConfig & server_peer_config ,
+		G::Slot::Signal<const std::string&> & forward_request ,
+		const GNet::ServerPeerConfig & server_peer_config , const GNet::ServerConfig & server_config ,
 		const GSmtp::Client::Config & client_config , const GAuth::Secrets & client_secrets ,
 		const G::StringArray & interfaces , unsigned int port , bool allow_remote ,
 		const std::string & remote_address , unsigned int connection_timeout ,
@@ -147,6 +151,9 @@ public:
 		///< Returns the connection timeout, as passed in to the
 		///< constructor.
 
+	void forward() ;
+		///< Called to trigger asynchronous forwarding.
+
 	bool notifying() const ;
 		///< Returns true if the remote user has asked for notifications.
 
@@ -166,7 +173,12 @@ public:
 	void operator=( AdminServer && ) = delete ;
 
 private:
+	void onForwardTimeout() ;
+
+private:
+	GNet::Timer<AdminServer> m_forward_timer ;
 	MessageStore & m_store ;
+	G::Slot::Signal<const std::string&> & m_forward_request ;
 	GSmtp::Client::Config m_client_config ;
 	const GAuth::Secrets & m_client_secrets ;
 	bool m_allow_remote ;
diff --git a/src/gsmtp/gsmtpclientprotocol.h b/src/gsmtp/gsmtpclientprotocol.h
index 2ba4e5d..0adf8be 100644
--- a/src/gsmtp/gsmtpclientprotocol.h
+++ b/src/gsmtp/gsmtpclientprotocol.h
@@ -105,7 +105,7 @@ public:
 
 	bool positive() const ;
 		///< Returns true if the numeric value of the
-		///< reply is less that four hundred.
+		///< reply is less than four hundred.
 
 	bool is( Value v ) const ;
 		///< Returns true if the reply value is 'v'.
diff --git a/src/gsmtp/gsmtpserver.cpp b/src/gsmtp/gsmtpserver.cpp
index e0e5e07..dbba9ac 100644
--- a/src/gsmtp/gsmtpserver.cpp
+++ b/src/gsmtp/gsmtpserver.cpp
@@ -207,7 +207,7 @@ GSmtp::Server::Server( GNet::ExceptionSink es , MessageStore & store ,
 	const GAuth::Secrets & client_secrets , const GAuth::Secrets & server_secrets ,
 	const Config & server_config , const std::string & forward_to ,
 	const GSmtp::Client::Config & client_config ) :
-		GNet::MultiServer(es,server_config.interfaces,server_config.port,"smtp",server_config.server_peer_config) ,
+		GNet::MultiServer(es,server_config.interfaces,server_config.port,"smtp",server_config.server_peer_config,server_config.server_config) ,
 		m_store(store) ,
 		m_server_config(server_config) ,
 		m_client_config(client_config) ,
diff --git a/src/gsmtp/gsmtpserver.h b/src/gsmtp/gsmtpserver.h
index a4eaf6c..a913268 100644
--- a/src/gsmtp/gsmtpserver.h
+++ b/src/gsmtp/gsmtpserver.h
@@ -62,6 +62,7 @@ public:
 		std::string verifier_address ;
 		unsigned int verifier_timeout{0U} ;
 		GNet::ServerPeerConfig server_peer_config ;
+		GNet::ServerConfig server_config ;
 		ServerProtocol::Config protocol_config ;
 		std::string sasl_server_config ;
 		std::string dnsbl_config ;
@@ -83,6 +84,7 @@ public:
 		Config & set_verifier_address( const std::string & ) ;
 		Config & set_verifier_timeout( unsigned int ) ;
 		Config & set_server_peer_config( const GNet::ServerPeerConfig & ) ;
+		Config & set_server_config( const GNet::ServerConfig & ) ;
 		Config & set_protocol_config( const ServerProtocol::Config & ) ;
 		Config & set_sasl_server_config( const std::string & ) ;
 		Config & set_dnsbl_config( const std::string & ) ;
@@ -195,6 +197,7 @@ inline GSmtp::Server::Config & GSmtp::Server::Config::set_filter_timeout( unsign
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_verifier_address( const std::string & s ) { verifier_address = s ; return *this ; }
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_verifier_timeout( unsigned int t ) { verifier_timeout = t ; return *this ; }
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_server_peer_config( const GNet::ServerPeerConfig & c ) { server_peer_config = c ; return *this ; }
+inline GSmtp::Server::Config & GSmtp::Server::Config::set_server_config( const GNet::ServerConfig & c ) { server_config = c ; return *this ; }
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_protocol_config( const ServerProtocol::Config & c ) { protocol_config = c ; return *this ; }
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_sasl_server_config( const std::string & s ) { sasl_server_config = s ; return *this ; }
 inline GSmtp::Server::Config & GSmtp::Server::Config::set_dnsbl_config( const std::string & s ) { dnsbl_config = s ; return *this ; }
diff --git a/src/gssl/Makefile.am b/src/gssl/Makefile.am
index 469040b..7ae0015 100644
--- a/src/gssl/Makefile.am
+++ b/src/gssl/Makefile.am
@@ -35,7 +35,8 @@ SSL_EXTRA_DIST = gssl_none.cpp gssl_openssl.cpp gssl_openssl.h gssl_use_openssl.
 SSL_SOURCES = gssl.h gssl.cpp gssl_mbedtls.cpp gssl_mbedtls.h gssl_use_mbedtls.cpp
 endif
 
-EXTRA_DIST=$(SSL_EXTRA_DIST)
+EXTRA_DIST = \
+	$(SSL_EXTRA_DIST)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/glib
 noinst_LIBRARIES = libgssl.a
diff --git a/src/gssl/Makefile.in b/src/gssl/Makefile.in
index e1d953b..f9e5616 100644
--- a/src/gssl/Makefile.in
+++ b/src/gssl/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -139,9 +139,13 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gssl.Po ./$(DEPDIR)/gssl_mbedtls.Po \
+	./$(DEPDIR)/gssl_none.Po ./$(DEPDIR)/gssl_openssl.Po \
+	./$(DEPDIR)/gssl_use_both.Po ./$(DEPDIR)/gssl_use_mbedtls.Po \
+	./$(DEPDIR)/gssl_use_openssl.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -258,6 +262,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -294,6 +299,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -328,7 +334,9 @@ top_srcdir = @top_srcdir@
 @GCONFIG_TLS_USE_MBEDTLS_TRUE@SSL_SOURCES = gssl.h gssl.cpp gssl_mbedtls.cpp gssl_mbedtls.h gssl_use_mbedtls.cpp
 @GCONFIG_TLS_USE_NONE_TRUE@SSL_SOURCES = gssl.h gssl_none.cpp
 @GCONFIG_TLS_USE_OPENSSL_TRUE@SSL_SOURCES = gssl.h gssl.cpp gssl_openssl.cpp gssl_openssl.h gssl_use_openssl.cpp
-EXTRA_DIST = $(SSL_EXTRA_DIST)
+EXTRA_DIST = \
+	$(SSL_EXTRA_DIST)
+
 AM_CPPFLAGS = -I$(top_srcdir)/src/glib
 noinst_LIBRARIES = libgssl.a
 libgssl_a_SOURCES = $(SSL_SOURCES)
@@ -353,8 +361,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -380,13 +388,19 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_mbedtls.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_none.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_openssl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_both.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_mbedtls.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_openssl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_mbedtls.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_openssl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_both.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_mbedtls.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssl_use_openssl.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -454,7 +468,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -523,7 +540,13 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gssl.Po
+	-rm -f ./$(DEPDIR)/gssl_mbedtls.Po
+	-rm -f ./$(DEPDIR)/gssl_none.Po
+	-rm -f ./$(DEPDIR)/gssl_openssl.Po
+	-rm -f ./$(DEPDIR)/gssl_use_both.Po
+	-rm -f ./$(DEPDIR)/gssl_use_mbedtls.Po
+	-rm -f ./$(DEPDIR)/gssl_use_openssl.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -569,7 +592,13 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gssl.Po
+	-rm -f ./$(DEPDIR)/gssl_mbedtls.Po
+	-rm -f ./$(DEPDIR)/gssl_none.Po
+	-rm -f ./$(DEPDIR)/gssl_openssl.Po
+	-rm -f ./$(DEPDIR)/gssl_use_both.Po
+	-rm -f ./$(DEPDIR)/gssl_use_mbedtls.Po
+	-rm -f ./$(DEPDIR)/gssl_use_openssl.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -589,18 +618,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/gssl/gssl_mbedtls.cpp b/src/gssl/gssl_mbedtls.cpp
index aa8ad70..b811594 100644
--- a/src/gssl/gssl_mbedtls.cpp
+++ b/src/gssl/gssl_mbedtls.cpp
@@ -36,7 +36,6 @@
 #include <mbedtls/ssl_ciphersuites.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/ctr_drbg.h>
-#include <mbedtls/certs.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
 #include <mbedtls/pem.h>
@@ -48,6 +47,11 @@
 #include <exception>
 #include <iomanip>
 
+#ifndef G_STR_PASTE
+#define G_STR_PASTE_IMP(a,b) a##b
+#define G_STR_PASTE(a,b) G_STR_PASTE_IMP(a,b)
+#endif
+
 // macro magic to provide function-name/function-pointer arguments for call()
 #ifdef FN
 #undef FN
@@ -55,13 +59,32 @@
 #define FN( fn ) (#fn),(fn)
 
 // in newer versions of the mbedtls library hashing functions like mbed_whatever_ret()
-// returning an integer are preferred, compared to mbed_whatever() returning void
-#define GSSL_PASTE_IMP( a , b ) a##b
-#define GSSL_PASTE( a , b ) GSSL_PASTE_IMP( a , b )
+// returning an integer are preferred, compared to mbed_whatever() returning void --
+// except in version 3 some functions go back to a void return
 #if MBEDTLS_VERSION_NUMBER >= 0x02070000
-#define FN_RET( fn ) (#fn),(GSSL_PASTE(fn,_ret))
+#define FN_RET( fn ) (#fn),(G_STR_PASTE(fn,_ret))
+#if MBEDTLS_VERSION_MAJOR >= 3
+#define FN_RETv3( fn ) (#fn),(fn)
+#else
+#define FN_RETv3( fn ) (#fn),(G_STR_PASTE(fn,_ret))
+#endif
 #else
 #define FN_RET( fn ) (#fn),(fn)
+#define FN_RETv3( fn ) (#fn),(fn)
+#endif
+
+// we need access to structure fields that are private in mbedtls v3.0 -- see
+// mbedtls migration guide
+#if MBEDTLS_VERSION_MAJOR >= 3
+#define GET MBEDTLS_PRIVATE
+#if MBEDTLS_VERSION_MINOR >= 1
+#define GET_RAW(field) field
+#else
+#define GET_RAW MBEDTLS_PRIVATE
+#endif
+#else
+#define GET(field) field
+#define GET_RAW(field) field
 #endif
 
 namespace GSsl
@@ -71,6 +94,7 @@ namespace GSsl
 		void randomFillImp( char * p , std::size_t n ) ;
 		int randomFill( void * , unsigned char * output , std::size_t len , std::size_t * olen ) ;
 
+		// calls the given function with error checking -- overload for functions returning int
 		template <typename F, typename... Args>
 		typename std::enable_if< !std::is_same<void,typename std::result_of<F(Args...)>::type>::value >::type
 		call( const char * fname , F fn , Args&&... args )
@@ -80,6 +104,7 @@ namespace GSsl
 				throw Error( fname , rc ) ;
 		}
 
+		// calls the given function -- overload for functions returning void
 		template <typename F, typename... Args>
 		typename std::enable_if< std::is_same<void,typename std::result_of<F(Args...)>::type>::value >::type
 		call( const char * , F fn , Args&&... args )
@@ -87,17 +112,26 @@ namespace GSsl
 			fn( std::forward<Args>(args)... ) ;
 		}
 
-		template <typename T>
-		struct ScopeExitCleanup /// Calls a mbedtls free function on descruction.
+		// calls mbedtls_pk_parse_key() with or without the new rng parameters
+		using old_fn = int (*)( mbedtls_pk_context * c , const unsigned char * k , std::size_t ks ,
+			const unsigned char * p , std::size_t ps ) ;
+		using new_fn = int (*)( mbedtls_pk_context* c , const unsigned char* k , std::size_t ks ,
+			const unsigned char * p , std::size_t ps ,
+			int (*r)(void*,unsigned char*,std::size_t) , void* rp ) ;
+		inline int call_fn( old_fn fn ,
+			mbedtls_pk_context * c , const unsigned char * k , std::size_t ks ,
+			const unsigned char * p , std::size_t ps ,
+			int (*)(void*,unsigned char*,std::size_t) , void * )
 		{
-			explicit ScopeExitCleanup( void (*fn)(T*) ) : m_fn(fn) , m_p(nullptr) {}
-			ScopeExitCleanup( void (*fn)(T*) , T * p ) : m_fn(fn) , m_p(p) {}
-			~ScopeExitCleanup() { reset() ; }
-			void reset( T * p = nullptr ) { if(m_p) m_fn(m_p) ; m_p = p ; }
-			void release() { m_p = nullptr ; }
-			void (*m_fn)(T*) ;
-			T * m_p ;
-		} ;
+			return fn( c , k , ks , p , ps ) ;
+		}
+		inline int call_fn( new_fn fn ,
+			mbedtls_pk_context * c , const unsigned char * k , std::size_t ks ,
+			const unsigned char * p , std::size_t ps ,
+			int (*r)(void*,unsigned char*,std::size_t) , void * rp )
+		{
+			return fn( c , k , ks , p , ps , r , rp ) ;
+		}
 
 		template <typename T>
 		struct X /// Initialises and frees an mbedtls object on construction and destruction.
@@ -273,7 +307,7 @@ std::string GSsl::MbedTls::LibraryImp::credit( const std::string & prefix , cons
 {
 	std::ostringstream ss ;
 	ss
-		<< prefix << "mbed TLS: Copy" << "right (C) 2006-2016, ARM Limited" << eol
+		<< prefix << "mbed TLS: Copy" << "right (C) 2006-2018, ARM Limited (or its affiliates)" << eol
 		<< eot ;
 	return ss.str() ;
 }
@@ -285,7 +319,7 @@ G::StringArray GSsl::MbedTls::LibraryImp::digesters( bool ) const
 
 GSsl::Digester GSsl::MbedTls::LibraryImp::digester( const std::string & hash_type , const std::string & state , bool need_state ) const
 {
-	return Digester( std::make_unique<GSsl::MbedTls::DigesterImp>(hash_type,state,need_state) ) ;
+	return Digester( std::make_unique<DigesterImp>(hash_type,state,need_state) ) ;
 }
 
 // ==
@@ -297,25 +331,41 @@ GSsl::MbedTls::Config::Config( G::StringArray & config ) :
 	m_min(-1),
 	m_max(-1)
 {
-	static const int SSL_v3 = MBEDTLS_SSL_MINOR_VERSION_0 ;
-	static const int TLS_v1_0 = MBEDTLS_SSL_MINOR_VERSION_1 ;
-	static const int TLS_v1_1 = MBEDTLS_SSL_MINOR_VERSION_2 ;
-	static const int TLS_v1_2 = MBEDTLS_SSL_MINOR_VERSION_3 ;
-
-	G_ASSERT( SSL_v3 >= 0 ) ;
-	G_ASSERT( TLS_v1_0 >= 0 ) ;
-	G_ASSERT( TLS_v1_1 >= 0 ) ;
-	G_ASSERT( TLS_v1_2 >= 0 ) ;
 
+#ifdef MBEDTLS_SSL_MINOR_VERSION_0
+	static constexpr int SSL_v3 = MBEDTLS_SSL_MINOR_VERSION_0 ;
+	static_assert( SSL_v3 >= 0 , "" ) ;
 	if( consume(config,"sslv3") ) m_min = SSL_v3 ;
-	if( consume(config,"tlsv1.0") ) m_min = TLS_v1_0 ;
-	if( consume(config,"tlsv1.1") ) m_min = TLS_v1_1 ;
-	if( consume(config,"tlsv1.2") ) m_min = TLS_v1_2 ;
-
 	if( consume(config,"-sslv3") ) m_max = SSL_v3 ;
+#endif
+
+#ifdef MBEDTLS_SSL_MINOR_VERSION_1
+	static constexpr int TLS_v1_0 = MBEDTLS_SSL_MINOR_VERSION_1 ;
+	static_assert( TLS_v1_0 >= 0 , "" ) ;
+	if( consume(config,"tlsv1.0") ) m_min = TLS_v1_0 ;
 	if( consume(config,"-tlsv1.0") ) m_max = TLS_v1_0 ;
+#endif
+
+#ifdef MBEDTLS_SSL_MINOR_VERSION_2
+	static constexpr int TLS_v1_1 = MBEDTLS_SSL_MINOR_VERSION_2 ;
+	static_assert( TLS_v1_1 >= 0 , "" ) ;
+	if( consume(config,"tlsv1.1") ) m_min = TLS_v1_1 ;
 	if( consume(config,"-tlsv1.1") ) m_max = TLS_v1_1 ;
+#endif
+
+#ifdef MBEDTLS_SSL_MINOR_VERSION_3
+	static constexpr int TLS_v1_2 = MBEDTLS_SSL_MINOR_VERSION_3 ;
+	static_assert( TLS_v1_2 >= 0 , "" ) ;
+	if( consume(config,"tlsv1.2") ) m_min = TLS_v1_2 ;
 	if( consume(config,"-tlsv1.2") ) m_max = TLS_v1_2 ;
+#endif
+
+#ifdef MBEDTLS_SSL_MINOR_VERSION_4
+	static constexpr int TLS_v1_3 = MBEDTLS_SSL_MINOR_VERSION_4 ;
+	static_assert( TLS_v1_3 >= 0 , "" ) ;
+	if( consume(config,"tlsv1.3") ) m_min = TLS_v1_3 ;
+	if( consume(config,"-tlsv1.3") ) m_max = TLS_v1_3 ;
+#endif
 }
 
 int GSsl::MbedTls::Config::min_() const
@@ -361,9 +411,9 @@ GSsl::MbedTls::DigesterImp::DigesterImp( const std::string & hash_name , const s
 
 		mbedtls_md5_init( &m_md5 ) ;
 		if( state.empty() )
-			call( FN_RET(mbedtls_md5_starts) , &m_md5 ) ;
+			call( FN_RETv3(mbedtls_md5_starts) , &m_md5 ) ;
 		else
-			G::HashState<16,uint32_t,uint32_t>::decode( state , m_md5.state , m_md5.total[0] ) ;
+			G::HashState<16,uint32_t,uint32_t>::decode( state , m_md5.GET(state) , m_md5.GET(total)[0] ) ;
 	}
 	else if( hash_name == "SHA1" )
 	{
@@ -374,9 +424,9 @@ GSsl::MbedTls::DigesterImp::DigesterImp( const std::string & hash_name , const s
 
 		mbedtls_sha1_init( &m_sha1 ) ;
 		if( state.empty() )
-			call( FN_RET(mbedtls_sha1_starts) , &m_sha1 ) ;
+			call( FN_RETv3(mbedtls_sha1_starts) , &m_sha1 ) ;
 		else
-			G::HashState<20,uint32_t,uint32_t>::decode( state , m_sha1.state , m_sha1.total[0] ) ;
+			G::HashState<20,uint32_t,uint32_t>::decode( state , m_sha1.GET(state) , m_sha1.GET(total)[0] ) ;
 	}
 	else if( hash_name == "SHA256" )
 	{
@@ -387,9 +437,9 @@ GSsl::MbedTls::DigesterImp::DigesterImp( const std::string & hash_name , const s
 
 		mbedtls_sha256_init( &m_sha256 ) ;
 		if( state.empty() )
-			call( FN_RET(mbedtls_sha256_starts) , &m_sha256 , 0 ) ;
+			call( FN_RETv3(mbedtls_sha256_starts) , &m_sha256 , 0 ) ;
 		else
-			G::HashState<32,uint32_t,uint32_t>::decode( state , m_sha256.state , m_sha256.total[0] ) ;
+			G::HashState<32,uint32_t,uint32_t>::decode( state , m_sha256.GET(state) , m_sha256.GET(total)[0] ) ;
 	}
 	else
 	{
@@ -410,11 +460,11 @@ GSsl::MbedTls::DigesterImp::~DigesterImp()
 void GSsl::MbedTls::DigesterImp::add( const std::string & s )
 {
 	if( m_hash_type == Type::Md5 )
-		call( FN_RET(mbedtls_md5_update) , &m_md5 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
+		call( FN_RETv3(mbedtls_md5_update) , &m_md5 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
 	else if( m_hash_type == Type::Sha1 )
-		call( FN_RET(mbedtls_sha1_update) , &m_sha1 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
+		call( FN_RETv3(mbedtls_sha1_update) , &m_sha1 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
 	else if( m_hash_type == Type::Sha256 )
-		call( FN_RET(mbedtls_sha256_update) , &m_sha256 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
+		call( FN_RETv3(mbedtls_sha256_update) , &m_sha256 , reinterpret_cast<const unsigned char*>(s.data()) , s.size() ) ;
 }
 
 std::string GSsl::MbedTls::DigesterImp::value()
@@ -422,19 +472,19 @@ std::string GSsl::MbedTls::DigesterImp::value()
 	if( m_hash_type == Type::Md5 )
 	{
 		unsigned char buffer[16] ;
-		call( FN_RET(mbedtls_md5_finish) , &m_md5 , buffer ) ;
+		call( FN_RETv3(mbedtls_md5_finish) , &m_md5 , buffer ) ;
 		return std::string( reinterpret_cast<const char*>(buffer) , sizeof(buffer) ) ;
 	}
 	else if( m_hash_type == Type::Sha1 )
 	{
 		unsigned char buffer[20] ;
-		call( FN_RET(mbedtls_sha1_finish) , &m_sha1 , buffer ) ;
+		call( FN_RETv3(mbedtls_sha1_finish) , &m_sha1 , buffer ) ;
 		return std::string( reinterpret_cast<const char*>(buffer) , sizeof(buffer) ) ;
 	}
 	else if( m_hash_type == Type::Sha256 )
 	{
 		unsigned char buffer[32] ;
-		call( FN_RET(mbedtls_sha256_finish) , &m_sha256 , buffer ) ;
+		call( FN_RETv3(mbedtls_sha256_finish) , &m_sha256 , buffer ) ;
 		return std::string( reinterpret_cast<const char*>(buffer) , sizeof(buffer) ) ;
 	}
 	else
@@ -446,11 +496,11 @@ std::string GSsl::MbedTls::DigesterImp::value()
 std::string GSsl::MbedTls::DigesterImp::state()
 {
 	if( m_hash_type == Type::Md5 )
-		return G::HashState<16,uint32_t,uint32_t>::encode( m_md5.state , m_md5.total[0] ) ;
+		return G::HashState<16,uint32_t,uint32_t>::encode( m_md5.GET(state) , m_md5.GET(total)[0] ) ;
 	else if( m_hash_type == Type::Sha1 )
-		return G::HashState<20,uint32_t,uint32_t>::encode( m_sha1.state , m_sha1.total[0] ) ;
+		return G::HashState<20,uint32_t,uint32_t>::encode( m_sha1.GET(state) , m_sha1.GET(total)[0] ) ;
 	else if( m_hash_type == Type::Sha256 )
-		return G::HashState<32,uint32_t,uint32_t>::encode( m_sha256.state , m_sha256.total[0] ) ;
+		return G::HashState<32,uint32_t,uint32_t>::encode( m_sha256.GET(state) , m_sha256.GET(total)[0] ) ;
 	else
 		return std::string() ;
 }
@@ -478,9 +528,11 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 	const std::string & profile_config ) :
 		m_library_imp(library_imp) ,
 		m_default_peer_certificate_name(default_peer_certificate_name) ,
-		m_default_peer_host_name(default_peer_host_name)
+		m_default_peer_host_name(default_peer_host_name) ,
+		m_authmode(0)
 {
-	ScopeExitCleanup<mbedtls_ssl_config> cleanup( mbedtls_ssl_config_free ) ;
+	mbedtls_ssl_config * cleanup_ptr = nullptr ;
+	G::ScopeExit cleanup( [&](){if(cleanup_ptr) mbedtls_ssl_config_free(cleanup_ptr);} ) ;
 
 	// use library config, or override with profile config
 	Config extra_config = library_imp.config() ;
@@ -497,7 +549,7 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 	{
 		m_config = mbedtls_ssl_config{} ;
 		mbedtls_ssl_config_init( &m_config ) ;
-		cleanup.reset( &m_config ) ;
+		cleanup_ptr = &m_config ;
 		int rc = mbedtls_ssl_config_defaults( &m_config ,
 			is_server_profile ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT , // see also mbedtls_ssl_conf_endpoint()
 			MBEDTLS_SSL_TRANSPORT_STREAM ,
@@ -507,7 +559,7 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 
 	// load up the certificate and private key ready for mbedtls_ssl_conf_own_cert()
 	if( !key_file.empty() )
-		m_pk.load( key_file ) ;
+		m_pk.load( key_file , library_imp.rng() ) ;
 	if( !cert_file.empty() )
 		m_certificate.load( cert_file ) ;
 
@@ -521,24 +573,23 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 
 	// configure verification
 	{
-		int authmode = 0 ;
 		if( ca_path.empty() )
 		{
 			// verify if possible, but continue on failure - see mbedtls_ssl_get_verify_result()
-			authmode = MBEDTLS_SSL_VERIFY_OPTIONAL ;
+			m_authmode = MBEDTLS_SSL_VERIFY_OPTIONAL ;
 
 			// mbedtls 2.4.2 can incorrectly fail to handshake when OPTIONAL so provide some more tweakability
 			if( is_server_profile && extra_config.servernoverify() )
-				authmode = MBEDTLS_SSL_VERIFY_NONE ;
+				m_authmode = MBEDTLS_SSL_VERIFY_NONE ;
 			else if( !is_server_profile && extra_config.clientnoverify() )
-				authmode = MBEDTLS_SSL_VERIFY_NONE ;
+				m_authmode = MBEDTLS_SSL_VERIFY_NONE ;
 			else if( mbedtls_version_get_number() <= 0x02040200 )
 				G_WARNING_ONCE( "GSsl::MbedTls::LibraryImp::ctor: mbedtls library version " << LibraryImp::version() << " is deprecated" ) ;
 		}
 		else if( ca_path == "<none>" )
 		{
 			// dont verify
-			authmode = MBEDTLS_SSL_VERIFY_NONE ;
+			m_authmode = MBEDTLS_SSL_VERIFY_NONE ;
 		}
 		else if( ca_path == "<default>" )
 		{
@@ -547,7 +598,7 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 			m_ca_list.load( ca_path_default ) ;
 			bool no_verify = extra_config.noverify() ;
 			mbedtls_ssl_conf_ca_chain( &m_config , m_ca_list.ptr() , crl() ) ;
-			authmode = no_verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_REQUIRED ;
+			m_authmode = no_verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_REQUIRED ;
 		}
 		else
 		{
@@ -555,9 +606,9 @@ GSsl::MbedTls::ProfileImp::ProfileImp( const LibraryImp & library_imp , bool is_
 			m_ca_list.load( ca_path ) ;
 			bool no_verify = extra_config.noverify() ;
 			mbedtls_ssl_conf_ca_chain( &m_config , m_ca_list.ptr() , crl() ) ;
-			authmode = no_verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_REQUIRED ;
+			m_authmode = no_verify ? MBEDTLS_SSL_VERIFY_OPTIONAL : MBEDTLS_SSL_VERIFY_REQUIRED ;
 		}
-		mbedtls_ssl_conf_authmode( &m_config , authmode ) ;
+		mbedtls_ssl_conf_authmode( &m_config , m_authmode ) ;
 	}
 
 	// configure protocol version
@@ -661,6 +712,11 @@ const std::string & GSsl::MbedTls::ProfileImp::defaultPeerHostName() const
 	return m_default_peer_host_name ;
 }
 
+int GSsl::MbedTls::ProfileImp::authmode() const
+{
+	return m_authmode ;
+}
+
 // ==
 
 GSsl::MbedTls::ProtocolImp::ProtocolImp( const ProfileImp & profile , const std::string & required_peer_certificate_name ,
@@ -800,12 +856,12 @@ GSsl::Protocol::Result GSsl::MbedTls::ProtocolImp::handshake()
 	if( result == Protocol::Result::ok )
 	{
 		const char * vstr = "" ;
-		if( m_ssl.ptr()->conf->authmode == MBEDTLS_SSL_VERIFY_NONE )
+		if( m_profile.authmode() == MBEDTLS_SSL_VERIFY_NONE )
 		{
 			m_verified = false ;
 			vstr = "peer certificate not verified" ;
 		}
-		else if( m_ssl.ptr()->conf->authmode == MBEDTLS_SSL_VERIFY_OPTIONAL )
+		else if( m_profile.authmode() == MBEDTLS_SSL_VERIFY_OPTIONAL )
 		{
 			int v = mbedtls_ssl_get_verify_result( m_ssl.ptr() ) ;
 			m_verified = v == 0 ;
@@ -856,16 +912,20 @@ std::string GSsl::MbedTls::ProtocolImp::getPeerCertificate()
 		const char * head = "-----BEGIN CERTIFICATE-----\n" ;
 		const char * tail = "-----END CERTIFICATE-----\n" ;
 
+		const unsigned char * raw_p = certificate->GET_RAW(raw).GET_RAW(p) ;
+		std::size_t raw_n = certificate->GET_RAW(raw).GET_RAW(len) ;
+
+		// get the required buffer size
 		std::size_t n = 0U ;
 		unsigned char c = '\0' ;
-		int rc = mbedtls_pem_write_buffer( head , tail , certificate->raw.p , certificate->raw.len , &c , 0 , &n ) ;
+		int rc = mbedtls_pem_write_buffer( head , tail , raw_p , raw_n , &c , 0 , &n ) ;
 		if( n == 0U || rc != MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL )
 			throw Error( "certificate error" ) ;
 		n = n + n ; // old polarssl bug required this
 
+		// write it into the correctly sized buffer
 		std::vector<unsigned char> buffer( n ) ;
-		rc = mbedtls_pem_write_buffer( head , tail , certificate->raw.p , certificate->raw.len ,
-				&buffer[0] , buffer.size() , &n ) ;
+		rc = mbedtls_pem_write_buffer( head , tail , raw_p , raw_n , &buffer[0] , buffer.size() , &n ) ;
 		if( n == 0 || rc != 0 )
 			throw Error( "certificate error" ) ;
 
@@ -921,6 +981,12 @@ mbedtls_ssl_context * GSsl::MbedTls::Context::ptr() const
 
 GSsl::MbedTls::Rng::Rng()
 {
+	// quote: "in the default Mbed TLS the entropy collector tries to use what
+	// the platform you run can provide -- for Linux and UNIX-like systems this
+	// is /dev/urandom -- for windows this is CryptGenRandom of the CryptoAPI
+	// --  these are considered strong entropy sources -- when you run Mbed TLS
+	// on a different platform, such as an embedded platform, you have to add
+	// platform-specific or application-specific entropy sources"
 	entropy = mbedtls_entropy_context{} ;
 	mbedtls_entropy_init( &entropy ) ;
 
@@ -954,10 +1020,10 @@ mbedtls_ctr_drbg_context * GSsl::MbedTls::Rng::ptr() const
 
 // ==
 
-static void scrub( unsigned char *p_in , std::size_t n )
+static void scrub( unsigned char * p_in , std::size_t n )
 {
 	// see also SecureZeroMemory(), memset_s(3), explicit_bzero(BSD) and mbedtls_zeroize()
-	volatile unsigned char *p = p_in ;
+	volatile unsigned char * p = p_in ;
 	while( n-- )
 		*p++ = 0U ;
 }
@@ -1018,7 +1084,7 @@ std::size_t GSsl::MbedTls::SecureFile::size() const
 
 bool GSsl::MbedTls::SecureFile::empty() const
 {
-	return size() == 0U ;
+	return m_buffer.empty() ;
 }
 
 // ==
@@ -1033,13 +1099,15 @@ GSsl::MbedTls::Key::~Key()
 	mbedtls_pk_free( &x ) ;
 }
 
-void GSsl::MbedTls::Key::load( const std::string & pem_file )
+void GSsl::MbedTls::Key::load( const std::string & pem_file , const Rng & rng )
 {
 	SecureFile file( pem_file , true ) ;
 	if( file.empty() )
 		throw Error( "cannot load private key from " + pem_file ) ;
 
-	int rc = mbedtls_pk_parse_key( &x , file.pu() , file.size() , nullptr , 0 ) ;
+	int rc = call_fn( mbedtls_pk_parse_key , &x , file.pu() , file.size() ,
+		nullptr , 0 , mbedtls_ctr_drbg_random , rng.ptr() ) ;
+
 	if( rc < 0 ) // negative error code
 		throw Error( "mbedtls_pk_parse_key" , rc ) ;
 	else if( rc > 0 ) // positive number of failed parts
@@ -1132,6 +1200,8 @@ std::string GSsl::MbedTls::Error::format( const std::string & fnname , int rc ,
 
 void GSsl::MbedTls::randomFillImp( char * p , std::size_t n )
 {
+	// see also mbedtls/programs/pkey/gen_key.c ...
+
 	int fd = G::File::open( "/dev/random" , G::File::InOutAppend::In ) ; // not "/dev/urandom" here
 	if( fd < 0 )
 	{
@@ -1147,7 +1217,7 @@ void GSsl::MbedTls::randomFillImp( char * p , std::size_t n )
 			throw Error( "cannot read /dev/random" ) ;
 
 		std::size_t nread = static_cast<std::size_t>( nread_s ) ;
-		if( nread > n )
+		if( nread > n ) // sanity check
 			throw Error( "cannot read /dev/random" ) ;
 
 		n -= nread ;
diff --git a/src/gssl/gssl_mbedtls.h b/src/gssl/gssl_mbedtls.h
index aae9ba3..89b0230 100644
--- a/src/gssl/gssl_mbedtls.h
+++ b/src/gssl/gssl_mbedtls.h
@@ -32,7 +32,6 @@
 #include <mbedtls/net_sockets.h>
 #endif
 #include <mbedtls/ctr_drbg.h>
-#include <mbedtls/certs.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
 #include <mbedtls/pem.h>
@@ -42,6 +41,7 @@
 #include <mbedtls/sha1.h>
 #include <mbedtls/sha256.h>
 #include <mbedtls/sha512.h>
+#include <memory>
 #include <stdexcept>
 #include <vector>
 #include <map>
@@ -118,7 +118,7 @@ class GSsl::MbedTls::Key
 public:
 	Key() ;
 	~Key() ;
-	void load( const std::string & file ) ;
+	void load( const std::string & file , const Rng & ) ;
 	mbedtls_pk_context * ptr() ;
 	mbedtls_pk_context * ptr() const ;
 
@@ -160,7 +160,7 @@ class GSsl::MbedTls::Error : public std::runtime_error
 {
 public:
 	explicit Error( const std::string & ) ;
-	Error( const std::string & , int rc , const std::string & more = std::string() ) ;
+	Error( const std::string & , int rc , const std::string & more = {} ) ;
 
 private:
 	static std::string format( const std::string & , int , const std::string & ) ;
@@ -283,6 +283,7 @@ public:
 	void logAt( int level_out , std::string ) const ;
 	const std::string & defaultPeerCertificateName() const ;
 	const std::string & defaultPeerHostName() const ;
+	int authmode() const ;
 
 private: // overrides
 	std::unique_ptr<ProtocolImpBase> newProtocol( const std::string & , const std::string & ) const override ;
@@ -305,6 +306,7 @@ private:
 	Key m_pk ;
 	Certificate m_certificate ;
 	Certificate m_ca_list ;
+	int m_authmode ;
 } ;
 
 //| \class GSsl::MbedTls::ProtocolImp
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 4605637..fdee588 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -60,6 +60,14 @@ LIB_SOURCES = \
 	serverconfiguration.cpp \
 	serverconfiguration.h
 
+TS_FILES = emailrelay_tr.no_NO.ts
+QM_IN_FILES = emailrelay.no.qm_in
+QM_FILES = emailrelay.no.qm
+
+emailrelay.no.qm: emailrelay.no.qm_in
+	-$(AWK) '/^[0123456789]/ {for(i=1;i<NF;i++){printf("%c",$$i)}}' $(srcdir)/emailrelay.no.qm_in > emailrelay.no.qm
+	@test -s $(QM_FILES)
+
 if GCONFIG_WINDOWS
 OS_EXTRA_DIST = $(MAC_SOURCES) $(UNIX_SOURCES)
 OS_SOURCES = $(WIN32_SOURCES)
@@ -77,6 +85,8 @@ endif
 endif
 
 EXTRA_DIST=\
+	$(TS_FILES) \
+	$(QM_IN_FILES) \
 	emailrelay-gui.exe.manifest \
 	gcominit.h \
 	messages.mc \
@@ -95,7 +105,7 @@ MOC_OBJECTS=\
 	moc_gpage.o \
 	moc_pages.o
 
-CLEANFILES = $(MOC_OUTPUT)
+CLEANFILES = $(MOC_OUTPUT) $(QM_FILES)
 DISTCLEANFILES = ./.deps/moc*
 
 AM_CPPFLAGS=\
@@ -130,6 +140,7 @@ moc_pages.cpp: $(srcdir)/pages.h
 noinst_SCRIPTS = $(OS_NOINST)
 noinst_LIBRARIES = libguimain.a
 libguimain_a_SOURCES = $(LIB_SOURCES)
+e_tr_DATA = $(QM_FILES)
 
 if GCONFIG_WINDOWS
 
@@ -158,7 +169,7 @@ endif
 install-exec-hook:
 	-mkdir -p "$(DESTDIR)$(sbindir)" 2>/dev/null
 	@echo "#!/bin/sh" > "$(DESTDIR)$(sbindir)/emailrelay-gui"
-	@echo exec $(DESTDIR)$(sbindir)/emailrelay-gui.real \"$$\@\" \"$0\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
+	@echo exec $(DESTDIR)$(sbindir)/emailrelay-gui.real --qmdir=$(DESTDIR)$(e_trdir) \"$$\@\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 	@echo "dir-install"=\"$(DESTDIR)/usr\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 	@echo "dir-spool"=\"$(DESTDIR)$(e_spooldir)\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 	@echo "dir-config"=\"$(DESTDIR)$(e_sysconfdir)\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
@@ -170,15 +181,6 @@ uninstall-hook:
 clean-local:
 	-rm -f payload
 
-TS_FILE=emailrelay_tr.en_SC.ts
-QM_FILE=emailrelay_tr.en_SC.qm
-.PHONY: translate
-translate:
-	rm $(TS_FILE) 2>/dev/null || true
-	lupdate $(QT_SOURCES) --target-language en_SC -ts $(TS_FILE)
-	translate.pl $(TS_FILE)
-	lrelease $(TS_FILE)
-
 else
 
 install-exec-hook:
@@ -192,3 +194,8 @@ payload: $(top_srcdir)/bin/make-setup.sh
 	-@chmod +x $(top_srcdir)/bin/make-setup.sh
 	$(top_srcdir)/bin/make-setup.sh $(MAKE_SETUP_DEBUG) $@ "$(top_srcdir)/src/gui/emailrelay-icon.png"
 
+.PHONY: lrelease
+lrelease:
+	$(QT_LRELEASE) emailrelay_tr.no_NO.ts -qm emailrelay.no.qm
+
+	
diff --git a/src/gui/Makefile.in b/src/gui/Makefile.in
index 70fc6f7..a184cdc 100644
--- a/src/gui/Makefile.in
+++ b/src/gui/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -36,6 +36,7 @@
 
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -120,9 +121,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(e_trdir)"
+PROGRAMS = $(sbin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
@@ -153,8 +156,6 @@ am__objects_5 = $(am__objects_4) dir.$(OBJEXT) glibsources.$(OBJEXT) \
 	legal.$(OBJEXT) serverconfiguration.$(OBJEXT)
 @GCONFIG_GUI_TRUE@am_libguimain_a_OBJECTS = $(am__objects_5)
 libguimain_a_OBJECTS = $(am_libguimain_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(sbindir)"
-PROGRAMS = $(sbin_PROGRAMS)
 am__emailrelay_gui_SOURCES_DIST = guimain.cpp installer.cpp \
 	gdialog.cpp gdialog.h gpage.cpp gpage.h pages.h pages.cpp \
 	gqt.h
@@ -185,9 +186,20 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/access_mac.Po \
+	./$(DEPDIR)/access_unix.Po ./$(DEPDIR)/access_win32.Po \
+	./$(DEPDIR)/boot_mac.Po ./$(DEPDIR)/boot_unix.Po \
+	./$(DEPDIR)/boot_win32.Po ./$(DEPDIR)/dir.Po \
+	./$(DEPDIR)/dir_mac.Po ./$(DEPDIR)/dir_unix.Po \
+	./$(DEPDIR)/dir_win32.Po ./$(DEPDIR)/gdialog.Po \
+	./$(DEPDIR)/glibsources.Po ./$(DEPDIR)/glink_mac.Po \
+	./$(DEPDIR)/glink_unix.Po ./$(DEPDIR)/glink_win32.Po \
+	./$(DEPDIR)/gpage.Po ./$(DEPDIR)/guimain.Po \
+	./$(DEPDIR)/installer.Po ./$(DEPDIR)/legal.Po \
+	./$(DEPDIR)/pages.Po ./$(DEPDIR)/serverconfiguration.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -224,6 +236,34 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+DATA = $(e_tr_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -307,6 +347,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -343,6 +384,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -396,6 +438,9 @@ LIB_SOURCES = \
 	serverconfiguration.cpp \
 	serverconfiguration.h
 
+TS_FILES = emailrelay_tr.no_NO.ts
+QM_IN_FILES = emailrelay.no.qm_in
+QM_FILES = emailrelay.no.qm
 @GCONFIG_MAC_FALSE@@GCONFIG_WINDOWS_FALSE@OS_EXTRA_DIST = $(MAC_SOURCES) $(WIN32_SOURCES)
 @GCONFIG_MAC_TRUE@@GCONFIG_WINDOWS_FALSE@OS_EXTRA_DIST = $(UNIX_SOURCES) $(WIN32_SOURCES)
 @GCONFIG_WINDOWS_TRUE@OS_EXTRA_DIST = $(MAC_SOURCES) $(UNIX_SOURCES)
@@ -406,6 +451,8 @@ LIB_SOURCES = \
 @GCONFIG_MAC_TRUE@@GCONFIG_WINDOWS_FALSE@OS_NOINST = 
 @GCONFIG_WINDOWS_TRUE@OS_NOINST = 
 EXTRA_DIST = \
+	$(TS_FILES) \
+	$(QM_IN_FILES) \
 	emailrelay-gui.exe.manifest \
 	gcominit.h \
 	messages.mc \
@@ -424,7 +471,7 @@ MOC_OBJECTS = \
 	moc_gpage.o \
 	moc_pages.o
 
-CLEANFILES = $(MOC_OUTPUT)
+CLEANFILES = $(MOC_OUTPUT) $(QM_FILES)
 DISTCLEANFILES = ./.deps/moc*
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/glib \
@@ -447,6 +494,7 @@ AM_CPPFLAGS = \
 @GCONFIG_GUI_TRUE@noinst_SCRIPTS = $(OS_NOINST)
 @GCONFIG_GUI_TRUE@noinst_LIBRARIES = libguimain.a
 @GCONFIG_GUI_TRUE@libguimain_a_SOURCES = $(LIB_SOURCES)
+@GCONFIG_GUI_TRUE@e_tr_DATA = $(QM_FILES)
 @GCONFIG_GUI_TRUE@@GCONFIG_WINDOWS_TRUE@emailrelay_gui_SOURCES = guimain.cpp $(QT_SOURCES)
 @GCONFIG_GUI_TRUE@@GCONFIG_WINDOWS_TRUE@emailrelay_gui_DEPENDENCIES = $(MOC_OBJECTS) libguimain.a
 @GCONFIG_GUI_TRUE@@GCONFIG_WINDOWS_TRUE@emailrelay_gui_LDADD = \
@@ -461,8 +509,6 @@ AM_CPPFLAGS = \
 @GCONFIG_GUI_TRUE@@GCONFIG_WINDOWS_FALSE@	libguimain.a \
 @GCONFIG_GUI_TRUE@@GCONFIG_WINDOWS_FALSE@	$(GCONFIG_QT_LIBS)
 
-@GCONFIG_GUI_TRUE@TS_FILE = emailrelay_tr.en_SC.ts
-@GCONFIG_GUI_TRUE@QM_FILE = emailrelay_tr.en_SC.qm
 all: all-am
 
 .SUFFIXES:
@@ -484,8 +530,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -496,14 +542,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libguimain.a: $(libguimain_a_OBJECTS) $(libguimain_a_DEPENDENCIES) $(EXTRA_libguimain_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libguimain.a
-	$(AM_V_AR)$(libguimain_a_AR) libguimain.a $(libguimain_a_OBJECTS) $(libguimain_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libguimain.a
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
@@ -547,6 +585,14 @@ uninstall-sbinPROGRAMS:
 clean-sbinPROGRAMS:
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libguimain.a: $(libguimain_a_OBJECTS) $(libguimain_a_DEPENDENCIES) $(EXTRA_libguimain_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libguimain.a
+	$(AM_V_AR)$(libguimain_a_AR) libguimain.a $(libguimain_a_OBJECTS) $(libguimain_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libguimain.a
+
 emailrelay-gui$(EXEEXT): $(emailrelay_gui_OBJECTS) $(emailrelay_gui_DEPENDENCIES) $(EXTRA_emailrelay_gui_DEPENDENCIES) 
 	@rm -f emailrelay-gui$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(emailrelay_gui_OBJECTS) $(emailrelay_gui_LDADD) $(LIBS)
@@ -561,27 +607,33 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_mac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_mac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_mac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibsources.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_mac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guimain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/installer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverconfiguration.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_mac.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_mac.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_mac.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibsources.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_mac.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glink_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpage.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guimain.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/installer.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pages.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverconfiguration.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -596,6 +648,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+install-e_trDATA: $(e_tr_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(e_tr_DATA)'; test -n "$(e_trdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_trdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_trdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(e_trdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(e_trdir)" || exit $$?; \
+	done
+
+uninstall-e_trDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(e_tr_DATA)'; test -n "$(e_trdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(e_trdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -649,7 +722,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -681,9 +757,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(SCRIPTS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(sbindir)"; do \
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(e_trdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -725,7 +801,27 @@ clean-am: clean-generic clean-local clean-noinstLIBRARIES \
 	clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/access_mac.Po
+	-rm -f ./$(DEPDIR)/access_unix.Po
+	-rm -f ./$(DEPDIR)/access_win32.Po
+	-rm -f ./$(DEPDIR)/boot_mac.Po
+	-rm -f ./$(DEPDIR)/boot_unix.Po
+	-rm -f ./$(DEPDIR)/boot_win32.Po
+	-rm -f ./$(DEPDIR)/dir.Po
+	-rm -f ./$(DEPDIR)/dir_mac.Po
+	-rm -f ./$(DEPDIR)/dir_unix.Po
+	-rm -f ./$(DEPDIR)/dir_win32.Po
+	-rm -f ./$(DEPDIR)/gdialog.Po
+	-rm -f ./$(DEPDIR)/glibsources.Po
+	-rm -f ./$(DEPDIR)/glink_mac.Po
+	-rm -f ./$(DEPDIR)/glink_unix.Po
+	-rm -f ./$(DEPDIR)/glink_win32.Po
+	-rm -f ./$(DEPDIR)/gpage.Po
+	-rm -f ./$(DEPDIR)/guimain.Po
+	-rm -f ./$(DEPDIR)/installer.Po
+	-rm -f ./$(DEPDIR)/legal.Po
+	-rm -f ./$(DEPDIR)/pages.Po
+	-rm -f ./$(DEPDIR)/serverconfiguration.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -742,7 +838,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-e_trDATA
 
 install-dvi: install-dvi-am
 
@@ -772,7 +868,27 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/access_mac.Po
+	-rm -f ./$(DEPDIR)/access_unix.Po
+	-rm -f ./$(DEPDIR)/access_win32.Po
+	-rm -f ./$(DEPDIR)/boot_mac.Po
+	-rm -f ./$(DEPDIR)/boot_unix.Po
+	-rm -f ./$(DEPDIR)/boot_win32.Po
+	-rm -f ./$(DEPDIR)/dir.Po
+	-rm -f ./$(DEPDIR)/dir_mac.Po
+	-rm -f ./$(DEPDIR)/dir_unix.Po
+	-rm -f ./$(DEPDIR)/dir_win32.Po
+	-rm -f ./$(DEPDIR)/gdialog.Po
+	-rm -f ./$(DEPDIR)/glibsources.Po
+	-rm -f ./$(DEPDIR)/glink_mac.Po
+	-rm -f ./$(DEPDIR)/glink_unix.Po
+	-rm -f ./$(DEPDIR)/glink_win32.Po
+	-rm -f ./$(DEPDIR)/gpage.Po
+	-rm -f ./$(DEPDIR)/guimain.Po
+	-rm -f ./$(DEPDIR)/installer.Po
+	-rm -f ./$(DEPDIR)/legal.Po
+	-rm -f ./$(DEPDIR)/pages.Po
+	-rm -f ./$(DEPDIR)/serverconfiguration.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -788,29 +904,34 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-sbinPROGRAMS
+uninstall-am: uninstall-e_trDATA uninstall-sbinPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: install-am install-exec-am install-strip uninstall-am
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-local clean-noinstLIBRARIES clean-sbinPROGRAMS \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-hook \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-local clean-noinstLIBRARIES \
+	clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-e_trDATA install-exec install-exec-am \
+	install-exec-hook install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-e_trDATA uninstall-hook \
 	uninstall-sbinPROGRAMS
 
 .PRECIOUS: Makefile
 
 
+emailrelay.no.qm: emailrelay.no.qm_in
+	-$(AWK) '/^[0123456789]/ {for(i=1;i<NF;i++){printf("%c",$$i)}}' $(srcdir)/emailrelay.no.qm_in > emailrelay.no.qm
+	@test -s $(QM_FILES)
+
 @GCONFIG_GUI_TRUE@moc_gdialog.cpp: $(srcdir)/gdialog.h
 @GCONFIG_GUI_TRUE@	$(GCONFIG_QT_MOC) $(srcdir)/gdialog.h -o $@
 
@@ -823,7 +944,7 @@ uninstall-am: uninstall-sbinPROGRAMS
 @GCONFIG_GUI_TRUE@install-exec-hook:
 @GCONFIG_GUI_TRUE@	-mkdir -p "$(DESTDIR)$(sbindir)" 2>/dev/null
 @GCONFIG_GUI_TRUE@	@echo "#!/bin/sh" > "$(DESTDIR)$(sbindir)/emailrelay-gui"
-@GCONFIG_GUI_TRUE@	@echo exec $(DESTDIR)$(sbindir)/emailrelay-gui.real \"$$\@\" \"$0\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
+@GCONFIG_GUI_TRUE@	@echo exec $(DESTDIR)$(sbindir)/emailrelay-gui.real --qmdir=$(DESTDIR)$(e_trdir) \"$$\@\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 @GCONFIG_GUI_TRUE@	@echo "dir-install"=\"$(DESTDIR)/usr\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 @GCONFIG_GUI_TRUE@	@echo "dir-spool"=\"$(DESTDIR)$(e_spooldir)\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
 @GCONFIG_GUI_TRUE@	@echo "dir-config"=\"$(DESTDIR)$(e_sysconfdir)\" >> "$(DESTDIR)$(sbindir)/emailrelay-gui"
@@ -834,12 +955,6 @@ uninstall-am: uninstall-sbinPROGRAMS
 
 @GCONFIG_GUI_TRUE@clean-local:
 @GCONFIG_GUI_TRUE@	-rm -f payload
-@GCONFIG_GUI_TRUE@.PHONY: translate
-@GCONFIG_GUI_TRUE@translate:
-@GCONFIG_GUI_TRUE@	rm $(TS_FILE) 2>/dev/null || true
-@GCONFIG_GUI_TRUE@	lupdate $(QT_SOURCES) --target-language en_SC -ts $(TS_FILE)
-@GCONFIG_GUI_TRUE@	translate.pl $(TS_FILE)
-@GCONFIG_GUI_TRUE@	lrelease $(TS_FILE)
 
 @GCONFIG_GUI_FALSE@install-exec-hook:
 
@@ -850,6 +965,10 @@ payload: $(top_srcdir)/bin/make-setup.sh
 	-@chmod +x $(top_srcdir)/bin/make-setup.sh
 	$(top_srcdir)/bin/make-setup.sh $(MAKE_SETUP_DEBUG) $@ "$(top_srcdir)/src/gui/emailrelay-icon.png"
 
+.PHONY: lrelease
+lrelease:
+	$(QT_LRELEASE) emailrelay_tr.no_NO.ts -qm emailrelay.no.qm
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/gui/boot_unix.cpp b/src/gui/boot_unix.cpp
index f1c68cb..9f1d8ad 100644
--- a/src/gui/boot_unix.cpp
+++ b/src/gui/boot_unix.cpp
@@ -31,11 +31,20 @@
 
 bool Boot::able( const G::Path & dir )
 {
-	// check /etc/init.d is writable
-	return
+	// check /etc/init.d and /etc/rc?.d are writable
+	static bool result =
 		!dir.empty() &&
 		G::Directory(dir).valid(true) &&
-		G::Directory(dir).writeable() ; // (creates a probe file)
+		G::Directory(dir+".."+"rc2.d").valid(true) &&
+		G::Directory(dir+".."+"rc3.d").valid(true) &&
+		G::Directory(dir+".."+"rc4.d").valid(true) &&
+		G::Directory(dir+".."+"rc5.d").valid(true) &&
+		G::Directory(dir).writeable() && // (creates a probe file)
+		G::Directory(dir+".."+"rc2.d").writeable() &&
+		G::Directory(dir+".."+"rc3.d").writeable() &&
+		G::Directory(dir+".."+"rc4.d").writeable() &&
+		G::Directory(dir+".."+"rc5.d").writeable() ;
+	return result ;
 }
 
 void Boot::install( const G::Path & dir_boot , const std::string & name , const G::Path & startstop_src , const G::Path & )
diff --git a/src/gui/emailrelay-gui.rc b/src/gui/emailrelay-gui.rc
index 247a514..6e1c56e 100644
--- a/src/gui/emailrelay-gui.rc
+++ b/src/gui/emailrelay-gui.rc
@@ -7,8 +7,8 @@ LANGUAGE 0x9,0x1
 IDI_ICON1 ICON DISCARDABLE "emailrelay-icon.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2, 2, 0, 0
- PRODUCTVERSION 2, 2, 0, 0
+ FILEVERSION 2, 2, 1, 0
+ PRODUCTVERSION 2, 2, 1, 0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -26,12 +26,12 @@ BEGIN
             VALUE "Comments", "GPL v3 license"
             VALUE "CompanyName", " "
             VALUE "FileDescription", "E-MailRelay GUI Application"
-            VALUE "FileVersion", "2, 2, 0, 0"
+            VALUE "FileVersion", "2, 2, 1, 0"
             VALUE "InternalName", "emailrelay"
             VALUE "LegalCopyright", "Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>"
             VALUE "OriginalFilename", "emailrelay-gui.exe"
             VALUE "ProductName", "E-MailRelay"
-            VALUE "ProductVersion", "2, 2, 0, 0"
+            VALUE "ProductVersion", "2, 2, 1, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/gui/emailrelay.no.qm_in b/src/gui/emailrelay.no.qm_in
new file mode 100644
index 0000000..6c64003
--- /dev/null
+++ b/src/gui/emailrelay.no.qm_in
@@ -0,0 +1,924 @@
+60 -72 100 24 -54 -17 -100 -107 -51 33 28 -65 96 -95 -67 -35 66 0 0 6
+-64 0 0 7 91 0 0 23 41 0 1 -45 -125 0 0 43 100 0 4 -90
+121 0 0 16 -30 0 5 48 -92 0 0 30 -105 0 5 86 69 0 0 17
+121 0 6 -74 69 0 0 26 11 0 6 -10 -62 0 0 14 -55 0 55 -77
+-50 0 0 10 -21 0 58 -71 -121 0 0 31 59 0 74 54 -107 0 0 19
+40 0 80 -95 9 0 0 61 54 0 82 -52 -68 0 0 33 127 0 84 -125
+-118 0 0 39 -39 0 84 -125 -118 0 0 49 97 0 84 -125 -118 0 0 56
+-65 0 87 105 122 0 0 40 -23 0 87 105 122 0 0 50 13 0 87 105
+122 0 0 57 107 0 90 104 52 0 0 18 8 0 90 -88 92 0 0 24
+16 0 96 44 101 0 0 26 -47 0 108 -52 -103 0 0 14 -99 0 122 118
+92 0 0 24 -54 0 -81 -96 112 0 0 59 32 0 -71 -91 -107 0 0 6
+-85 0 -61 51 -34 0 0 55 54 1 16 0 21 0 0 42 -16 1 16 0
+23 0 0 43 42 1 63 -111 -45 0 0 28 -94 1 -123 23 85 0 0 19
+-82 1 -77 115 -119 0 0 1 -11 1 -30 43 37 0 0 22 60 2 3 30
+-50 0 0 60 -27 2 55 56 -91 0 0 59 126 2 62 104 105 0 0 2
+-28 2 110 11 -89 0 0 12 -95 2 122 -117 -125 0 0 15 -59 2 -124 17
+0 0 0 42 -124 2 -87 11 34 0 0 38 121 2 -87 11 34 0 0 56
+120 2 -77 73 -75 0 0 35 44 2 -34 -8 126 0 0 46 -6 2 -7 -59
+-59 0 0 27 -48 3 4 118 44 0 0 11 -49 3 4 118 -108 0 0 52
+18 3 17 -23 57 0 0 10 84 3 54 111 126 0 0 48 119 3 54 111
+126 0 0 54 111 3 93 -32 23 0 0 33 -25 3 -125 -3 7 0 0 25
+65 3 -118 -72 -27 0 0 11 -117 3 -111 71 36 0 0 12 -7 3 -48 57
+-62 0 0 16 122 3 -19 102 -9 0 0 35 127 4 17 0 2 0 0 42
+-73 4 55 -122 -91 0 0 53 106 4 59 36 115 0 0 39 65 4 69 -57
+-66 0 0 51 10 4 109 -94 -42 0 0 41 -98 4 109 -94 -40 0 0 41
+-25 4 112 -17 -117 0 0 64 -35 4 126 76 -109 0 0 55 -102 4 -104 73
+-68 0 0 18 -6 4 -103 110 -107 0 0 8 -14 4 -103 110 -107 0 0 32
+-90 4 -103 110 -107 0 0 54 -70 4 -94 -4 84 0 0 16 -79 4 -80 -94
+87 0 0 32 47 4 -55 57 -59 0 0 36 -94 4 -49 98 -50 0 0 19
+123 5 40 -60 -104 0 0 19 81 5 56 91 124 0 0 60 101 5 73 -11
+39 0 0 45 -87 5 76 -8 117 0 0 7 -67 5 105 -93 56 0 0 46
+105 5 105 -24 -107 0 0 2 82 5 108 -73 -60 0 0 34 107 5 -106 115
+-50 0 0 38 17 5 -102 -112 116 0 0 17 -90 5 -100 -100 -62 0 0 13
+-54 5 -100 -100 -62 0 0 17 -41 5 -96 -52 21 0 0 31 -73 5 -89 -84
+5 0 0 31 -13 5 -64 103 84 0 0 11 31 5 -45 94 -4 0 0 37
+-96 5 -24 -98 60 0 0 45 81 6 37 7 53 0 0 20 68 6 52 90
+32 0 0 60 -103 6 55 114 -28 0 0 36 -19 6 71 38 27 0 0 64
+107 6 99 -87 -29 0 0 37 89 6 106 33 3 0 0 28 74 6 111 113
+114 0 0 8 -85 6 -122 99 13 0 0 22 -27 6 -113 -49 69 0 0 0
+0 6 -89 -96 36 0 0 40 66 6 -49 10 -77 0 0 1 -74 6 -49 10
+-77 0 0 3 -107 6 -49 10 -77 0 0 5 -84 6 -48 58 -62 0 0 23
+-35 6 -38 -45 116 0 0 50 -117 6 -20 97 -34 0 0 23 -107 6 -11 -1
+117 0 0 44 -11 6 -1 58 -50 0 0 43 -22 7 2 -85 99 0 0 14
+63 7 50 -18 83 0 0 32 -38 7 64 92 -91 0 0 14 -12 7 97 12
+21 0 0 15 86 7 107 63 82 0 0 25 -49 7 -119 -39 5 0 0 18
+58 7 -103 -56 -30 0 0 40 122 7 -102 108 20 0 0 48 67 7 -102 108
+20 0 0 54 59 7 -101 -90 68 0 0 15 37 7 -72 55 37 0 0 61
+-57 7 -60 -75 -30 0 0 13 -118 7 -60 -75 -30 0 0 57 -6 7 -55 -33
+-110 0 0 13 74 7 -50 -93 20 0 0 49 -109 7 -50 -93 20 0 0 56
+-15 7 -29 -41 -61 0 0 29 -70 7 -24 -42 -93 0 0 31 112 7 -2 -88
+5 0 0 1 64 8 70 -38 34 0 0 41 86 8 88 70 -48 0 0 41
+20 8 101 16 122 0 0 54 -15 8 103 -98 -109 0 0 50 -49 8 103 -98
+-109 0 0 58 62 8 109 -92 -66 0 0 47 -116 8 -60 108 -60 0 0 62
+31 8 -60 108 -60 0 0 63 29 8 -45 -78 9 0 0 20 -32 8 -3 -90
+-37 0 0 64 33 9 11 86 -71 0 0 12 0 9 81 111 110 0 0 51
+106 9 81 111 110 0 0 58 121 9 86 -23 -61 0 0 46 -77 9 108 -79
+-38 0 0 33 -82 9 -126 -59 -12 0 0 30 -2 9 -96 97 37 0 0 0
+-55 9 -90 -63 -61 0 0 37 39 9 -59 80 55 0 0 26 56 9 -59 -80
+69 0 0 24 -110 9 -43 37 5 0 0 24 74 9 -31 -81 -94 0 0 16
+46 9 -31 -1 -46 0 0 23 77 9 -28 -121 -69 0 0 18 -112 10 1 29
+-69 0 0 63 -71 10 5 37 53 0 0 36 89 10 12 -97 46 0 0 62
+87 10 45 -124 84 0 0 42 48 10 47 -59 -13 0 0 30 25 10 74 67
+0 0 0 59 -39 10 -124 18 -59 0 0 7 95 10 -120 43 -25 0 0 43
+-87 10 -84 86 94 0 0 30 -59 10 -82 62 -6 0 0 40 -76 10 -82 62
+-6 0 0 49 -47 10 -82 62 -6 0 0 57 47 10 -76 76 -22 0 0 48
+-62 10 -68 49 -7 0 0 9 40 10 -48 80 -72 0 0 18 -57 10 -36 -126
+-28 0 0 21 -10 10 -10 -20 26 0 0 55 -45 10 -8 -121 -59 0 0 28
+3 10 -3 -121 115 0 0 9 -121 11 78 48 -60 0 0 29 8 11 78 48
+-58 0 0 29 97 11 99 -62 51 0 0 60 40 11 -111 -1 -55 0 0 38
+-71 11 -81 -39 74 0 0 9 -64 11 -53 21 -9 0 0 34 -37 11 -32 -95
+19 0 0 30 82 12 6 -115 -2 0 0 52 -40 12 17 -26 -97 0 0 3
+-45 12 17 -26 -97 0 0 5 -19 12 17 -26 -97 0 0 7 10 12 17 -26
+-97 0 0 21 -92 12 17 -26 -97 0 0 25 -128 12 17 -26 -97 0 0 61
+117 12 17 -26 -97 0 0 62 -49 12 26 69 88 0 0 52 71 12 28 24
+-66 0 0 33 42 12 56 113 84 0 0 4 -113 12 58 55 -62 0 0 24
+-6 12 73 39 -87 0 0 35 -32 12 -81 -44 67 0 0 34 -99 12 -56 -58
+-43 0 0 32 103 12 -22 49 -61 0 0 40 4 12 -12 113 -98 0 0 44
+113 13 3 -84 26 0 0 17 17 13 3 -84 -45 0 0 17 69 13 17 -96
+85 0 0 8 75 13 32 -83 -108 0 0 5 40 13 85 5 -125 0 0 34
+28 13 -49 95 121 0 0 49 0 13 -49 95 121 0 0 56 23 13 -13 9
+-75 0 0 4 38 13 -13 9 -75 0 0 6 67 14 5 55 30 0 0 53
+-45 14 82 -2 -103 0 0 9 -8 14 127 -50 53 0 0 26 104 14 -123 112
+5 0 0 12 79 14 -117 -62 63 0 0 47 -12 14 -104 127 110 0 0 51
+-73 14 -46 109 -119 0 0 0 96 14 -28 -89 -23 0 0 10 -92 14 -25 14
+-70 0 0 22 -99 15 41 122 -53 0 0 63 81 15 59 -15 -2 0 0 57
+-99 15 82 87 -39 0 0 13 -5 15 88 -10 -30 0 0 50 63 15 113 -3
+53 0 0 27 28 15 -93 -89 -120 0 0 58 -58 15 -63 -41 -93 0 0 52
+-111 15 -30 44 101 0 0 21 73 105 0 0 65 70 3 0 0 0 40 0
+107 0 111 0 112 0 105 0 101 0 114 0 101 0 114 0 32 0 112 0
+97 0 121 0 108 0 111 0 97 0 100 0 32 0 102 0 105 0 108 8
+0 0 0 0 6 0 0 0 20 99 111 112 121 105 110 103 32 112 97 121
+108 111 97 100 32 102 105 108 101 7 0 0 0 15 67 111 112 121 80 97
+121 108 111 97 100 70 105 108 101 1 3 0 0 0 44 0 107 0 111 0
+112 0 105 0 101 0 114 0 101 0 114 0 32 0 112 0 97 0 121 0
+108 0 111 0 97 0 100 0 32 0 109 0 97 0 112 0 112 0 101 8
+0 0 0 0 6 0 0 0 25 99 111 112 121 105 110 103 32 112 97 121
+108 111 97 100 32 100 105 114 101 99 116 111 114 121 7 0 0 0 15 67
+111 112 121 80 97 121 108 111 97 100 84 114 101 101 1 3 0 0 0 56
+0 111 0 112 0 112 0 114 0 101 0 116 0 116 0 101 0 114 0 32
+0 111 0 112 0 112 0 115 0 116 0 97 0 114 0 116 0 32 0 98
+0 97 0 116 0 99 0 104 0 32 0 102 0 105 0 108 8 0 0 0
+0 6 0 0 0 27 99 114 101 97 116 105 110 103 32 115 116 97 114 116
+117 112 32 98 97 116 99 104 32 102 105 108 101 7 0 0 0 15 67 114
+101 97 116 101 66 97 116 99 104 70 105 108 101 1 3 0 0 0 54 0
+111 0 112 0 112 0 114 0 101 0 116 0 116 0 101 0 114 0 32 0
+107 0 111 0 110 0 102 0 105 0 103 0 117 0 114 0 97 0 115 0
+106 0 111 0 110 0 115 0 102 0 105 0 108 8 0 0 0 0 6 0
+0 0 27 99 114 101 97 116 105 110 103 32 99 111 110 102 105 103 117 114
+97 116 105 111 110 32 102 105 108 101 7 0 0 0 16 67 114 101 97 116
+101 67 111 110 102 105 103 70 105 108 101 1 3 0 0 0 20 0 101 0
+107 0 115 0 105 0 115 0 116 0 101 0 114 0 101 0 114 8 0 0
+0 0 6 0 0 0 6 101 120 105 115 116 115 7 0 0 0 16 67 114
+101 97 116 101 67 111 110 102 105 103 70 105 108 101 1 3 0 0 0 36
+0 111 0 112 0 112 0 114 0 101 0 116 0 116 0 101 0 114 0 32
+0 37 0 49 0 32 0 109 0 97 0 112 0 112 0 101 8 0 0 0
+0 6 0 0 0 21 99 114 101 97 116 105 110 103 32 37 49 32 100 105
+114 101 99 116 111 114 121 7 0 0 0 15 67 114 101 97 116 101 68 105
+114 101 99 116 111 114 121 1 3 0 0 0 74 0 109 0 97 0 112 0
+112 0 101 0 32 0 101 0 107 0 115 0 105 0 115 0 116 0 101 0
+114 0 101 0 114 0 32 0 109 0 101 0 110 0 32 0 101 0 114 0
+32 0 105 0 107 0 107 0 101 0 32 0 115 0 107 0 114 0 105 0
+118 0 98 0 97 0 114 8 0 0 0 0 6 0 0 0 36 100 105 114
+101 99 116 111 114 121 32 101 120 105 115 116 115 32 98 117 116 32 105 115
+32 110 111 116 32 119 114 105 116 97 98 108 101 7 0 0 0 15 67 114
+101 97 116 101 68 105 114 101 99 116 111 114 121 1 3 0 0 0 94 0
+109 0 97 0 112 0 112 0 101 0 115 0 116 0 105 0 32 0 101 0
+107 0 115 0 105 0 115 0 116 0 101 0 114 0 101 0 114 0 32 0
+109 0 101 0 110 0 32 0 101 0 114 0 32 0 105 0 107 0 107 0
+101 0 32 0 101 0 110 0 32 0 103 0 121 0 108 0 100 0 105 0
+103 0 32 0 109 0 97 0 112 0 112 0 101 8 0 0 0 0 6 0
+0 0 47 100 105 114 101 99 116 111 114 121 32 112 97 116 104 32 101 120
+105 115 116 115 32 98 117 116 32 110 111 116 32 118 97 108 105 100 32 97
+32 100 105 114 101 99 116 111 114 121 7 0 0 0 15 67 114 101 97 116
+101 68 105 114 101 99 116 111 114 121 1 3 0 0 0 20 0 101 0 107
+0 115 0 105 0 115 0 116 0 101 0 114 0 101 0 114 8 0 0 0
+0 6 0 0 0 6 101 120 105 115 116 115 7 0 0 0 15 67 114 101
+97 116 101 68 105 114 101 99 116 111 114 121 1 3 0 0 0 34 0 105
+0 110 0 103 0 101 0 110 0 116 0 105 0 110 0 103 0 32 0 -27
+0 -88 0 103 0 106 0 -8 0 114 0 101 8 0 0 0 0 6 0 0
+0 13 110 111 116 104 105 110 103 32 116 111 32 100 111 7 0 0 0 15
+67 114 101 97 116 101 68 105 114 101 99 116 111 114 121 1 3 0 0 0
+46 0 107 0 97 0 110 0 32 0 105 0 107 0 107 0 101 0 32 0
+115 0 107 0 114 0 105 0 118 0 101 0 32 0 116 0 105 0 108 0
+32 0 102 0 105 0 108 8 0 0 0 0 6 0 0 0 20 99 97 110
+110 111 116 32 119 114 105 116 101 32 116 111 32 102 105 108 101 7 0 0
+0 18 67 114 101 97 116 101 70 105 108 116 101 114 83 99 114 105 112 116
+1 3 0 0 0 76 0 111 0 112 0 112 0 114 0 101 0 116 0 116
+0 101 0 114 0 32 0 101 0 116 0 32 0 116 0 111 0 109 0 116
+0 32 0 107 0 108 0 105 0 101 0 110 0 116 0 32 0 102 0 105
+0 108 0 116 0 101 0 114 0 32 0 115 0 107 0 114 0 105 0 112
+0 116 8 0 0 0 0 6 0 0 0 38 99 114 101 97 116 105 110 103
+32 97 110 32 101 109 112 116 121 32 99 108 105 101 110 116 32 102 105 108
+116 101 114 32 115 99 114 105 112 116 7 0 0 0 18 67 114 101 97 116
+101 70 105 108 116 101 114 83 99 114 105 112 116 1 3 0 0 0 62 0
+111 0 112 0 112 0 114 0 101 0 116 0 116 0 101 0 114 0 32 0
+101 0 116 0 32 0 116 0 111 0 109 0 116 0 32 0 102 0 105 0
+108 0 116 0 101 0 114 0 32 0 115 0 107 0 114 0 105 0 112 0
+116 8 0 0 0 0 6 0 0 0 31 99 114 101 97 116 105 110 103 32
+97 110 32 101 109 112 116 121 32 102 105 108 116 101 114 32 115 99 114 105
+112 116 7 0 0 0 18 67 114 101 97 116 101 70 105 108 116 101 114 83
+99 114 105 112 116 1 3 0 0 0 20 0 101 0 107 0 115 0 105 0
+115 0 116 0 101 0 114 0 101 0 114 8 0 0 0 0 6 0 0 0
+6 101 120 105 115 116 115 7 0 0 0 18 67 114 101 97 116 101 70 105
+108 116 101 114 83 99 114 105 112 116 1 3 0 0 0 34 0 105 0 110
+0 103 0 101 0 110 0 116 0 105 0 110 0 103 0 32 0 -27 0 32
+0 103 0 106 0 -8 0 114 0 101 8 0 0 0 0 6 0 0 0 13
+110 111 116 104 105 110 103 32 116 111 32 100 111 7 0 0 0 18 67 114
+101 97 116 101 70 105 108 116 101 114 83 99 114 105 112 116 1 3 0 0
+0 46 0 107 0 97 0 110 0 32 0 105 0 107 0 107 0 101 0 32
+0 115 0 107 0 114 0 105 0 118 0 101 0 32 0 116 0 105 0 108
+0 32 0 102 0 105 0 108 8 0 0 0 0 6 0 0 0 20 99 97
+110 110 111 116 32 119 114 105 116 101 32 116 111 32 102 105 108 101 7 0
+0 0 17 67 114 101 97 116 101 80 111 105 110 116 101 114 70 105 108 101
+1 3 0 0 0 36 0 111 0 112 0 112 0 114 0 101 0 116 0 116
+0 101 0 114 0 32 0 112 0 101 0 107 0 101 0 114 0 102 0 105
+0 108 8 0 0 0 0 6 0 0 0 21 99 114 101 97 116 105 110 103
+32 112 111 105 110 116 101 114 32 102 105 108 101 7 0 0 0 17 67 114
+101 97 116 101 80 111 105 110 116 101 114 70 105 108 101 1 3 0 0 0
+34 0 105 0 110 0 103 0 101 0 110 0 116 0 105 0 110 0 103 0
+32 0 -27 0 32 0 103 0 106 0 -8 0 114 0 101 8 0 0 0 0
+6 0 0 0 13 110 111 116 104 105 110 103 32 116 111 32 100 111 7 0
+0 0 17 67 114 101 97 116 101 80 111 105 110 116 101 114 70 105 108 101
+1 3 0 0 0 42 0 107 0 97 0 110 0 32 0 105 0 107 0 107
+0 101 0 32 0 111 0 112 0 112 0 114 0 101 0 116 0 116 0 101
+0 32 0 102 0 105 0 108 8 0 0 0 0 6 0 0 0 18 99 97
+110 110 111 116 32 99 114 101 97 116 101 32 102 105 108 101 7 0 0 0
+13 67 114 101 97 116 101 83 101 99 114 101 116 115 1 3 0 0 0 72
+0 111 0 112 0 112 0 114 0 101 0 116 0 116 0 101 0 114 0 32
+0 97 0 117 0 116 0 101 0 110 0 116 0 105 0 115 0 101 0 114
+0 105 0 110 0 103 0 32 0 104 0 101 0 109 0 109 0 101 0 108
+0 105 0 103 0 32 0 102 0 105 0 108 8 0 0 0 0 6 0 0
+0 36 99 114 101 97 116 105 110 103 32 97 117 116 104 101 110 116 105 99
+97 116 105 111 110 32 115 101 99 114 101 116 115 32 102 105 108 101 7 0
+0 0 13 67 114 101 97 116 101 83 101 99 114 101 116 115 1 3 0 0
+0 40 0 45 0 45 0 112 0 105 0 100 0 45 0 102 0 105 0 108
+0 44 0 32 0 45 0 45 0 108 0 111 0 103 0 103 0 102 0 105
+0 108 8 0 0 0 0 6 0 0 0 22 45 45 112 105 100 45 102 105
+108 101 44 32 45 45 108 111 103 45 102 105 108 101 7 0 0 0 13 68
+105 114 101 99 116 111 114 121 80 97 103 101 1 3 0 0 0 26 0 45
+0 45 0 115 0 112 0 111 0 111 0 108 0 45 0 109 0 97 0 112
+0 112 0 101 8 0 0 0 0 6 0 0 0 11 45 45 115 112 111 111
+108 45 100 105 114 7 0 0 0 13 68 105 114 101 99 116 111 114 121 80
+97 103 101 1 3 0 0 0 14 0 85 0 116 0 102 0 111 0 114 0
+115 0 107 8 0 0 0 0 6 0 0 0 6 66 114 111 119 115 101 7
+0 0 0 13 68 105 114 101 99 116 111 114 121 80 97 103 101 1 3 0
+0 0 38 0 75 0 111 0 110 0 102 0 105 0 103 0 117 0 114 0
+97 0 115 0 106 0 111 0 110 0 115 0 109 0 97 0 112 0 112 0
+101 8 0 0 0 0 6 0 0 0 23 67 111 110 102 105 103 117 114 97
+116 105 111 110 32 100 105 114 101 99 116 111 114 121 7 0 0 0 13 68
+105 114 101 99 116 111 114 121 80 97 103 101 1 3 0 0 0 12 0 77
+0 97 0 112 0 112 0 101 0 114 8 0 0 0 0 6 0 0 0 11
+68 105 114 101 99 116 111 114 105 101 115 7 0 0 0 13 68 105 114 101
+99 116 111 114 121 80 97 103 101 1 3 0 0 0 12 0 77 0 97 0
+112 0 112 0 101 0 58 8 0 0 0 0 6 0 0 0 10 68 105 114
+101 99 116 111 114 121 58 7 0 0 0 13 68 105 114 101 99 116 111 114
+121 80 97 103 101 1 3 0 0 0 36 0 73 0 110 0 115 0 116 0
+97 0 108 0 108 0 97 0 115 0 106 0 111 0 110 0 115 0 109 0
+97 0 112 0 112 0 101 8 0 0 0 0 6 0 0 0 22 73 110 115
+116 97 108 108 97 116 105 111 110 32 100 105 114 101 99 116 111 114 121 7
+0 0 0 13 68 105 114 101 99 116 111 114 121 80 97 103 101 1 3 0
+0 0 28 0 82 0 117 0 110 0 45 0 116 0 105 0 109 0 101 0
+32 0 109 0 97 0 112 0 112 0 101 8 0 0 0 0 6 0 0 0
+18 82 117 110 45 116 105 109 101 32 100 105 114 101 99 116 111 114 121 7
+0 0 0 13 68 105 114 101 99 116 111 114 121 80 97 103 101 1 3 0
+0 0 22 0 83 0 112 0 111 0 111 0 108 0 32 0 109 0 97 0
+112 0 112 0 101 8 0 0 0 0 6 0 0 0 15 83 112 111 111 108
+32 100 105 114 101 99 116 111 114 121 7 0 0 0 13 68 105 114 101 99
+116 111 114 121 80 97 103 101 1 3 0 0 0 14 0 45 0 45 0 97
+0 100 0 109 0 105 0 110 8 0 0 0 0 6 0 0 0 7 45 45
+97 100 109 105 110 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101
+1 3 0 0 0 54 0 45 0 45 0 118 0 105 0 100 0 101 0 114
+0 101 0 115 0 101 0 110 0 100 0 32 0 118 0 101 0 100 0 32
+0 102 0 114 0 97 0 107 0 111 0 98 0 108 0 105 0 110 0 103
+8 0 0 0 0 6 0 0 0 23 45 45 102 111 114 119 97 114 100 45
+111 110 45 100 105 115 99 111 110 110 101 99 116 7 0 0 0 10 68 111
+87 104 97 116 80 97 103 101 1 3 0 0 0 26 0 45 0 45 0 117
+0 109 0 105 0 100 0 100 0 101 0 108 0 98 0 97 0 114 0 116
+8 0 0 0 0 6 0 0 0 11 45 45 105 109 109 101 100 105 97 116
+101 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101 1 3 0 0
+0 12 0 45 0 45 0 112 0 111 0 108 0 108 8 0 0 0 0 6
+0 0 0 6 45 45 112 111 108 108 7 0 0 0 10 68 111 87 104 97
+116 80 97 103 101 1 3 0 0 0 30 0 83 0 106 0 101 0 107 0
+107 0 32 0 112 0 101 0 114 0 105 0 111 0 100 0 105 0 115 0
+107 8 0 0 0 0 6 0 0 0 18 67 104 101 99 107 32 112 101 114
+105 111 100 105 99 97 108 108 121 7 0 0 0 10 68 111 87 104 97 116
+80 97 103 101 1 3 0 0 0 34 0 73 0 110 0 115 0 116 0 97
+0 108 0 108 0 97 0 115 0 106 0 111 0 110 0 115 0 116 0 121
+0 112 0 101 8 0 0 0 0 6 0 0 0 17 73 110 115 116 97 108
+108 97 116 105 111 110 32 116 121 112 101 7 0 0 0 10 68 111 87 104
+97 116 80 97 103 101 1 3 0 0 0 42 0 86 0 105 0 100 0 101
+0 114 0 101 0 115 0 101 0 110 0 100 0 105 0 110 0 103 0 32
+0 97 0 118 0 32 0 112 0 111 0 115 0 116 8 0 0 0 0 6
+0 0 0 15 77 97 105 108 32 102 111 114 119 97 114 100 105 110 103 7
+0 0 0 10 68 111 87 104 97 116 80 97 103 101 1 3 0 0 0 36
+0 75 0 117 0 110 0 32 0 112 0 -27 0 32 0 102 0 111 0 114
+0 101 0 115 0 112 0 -8 0 114 0 115 0 101 0 108 8 0 0 0
+0 6 0 0 0 14 79 110 108 121 32 111 110 32 100 101 109 97 110 100
+7 0 0 0 10 68 111 87 104 97 116 80 97 103 101 1 3 0 0 0
+22 0 80 0 79 0 80 0 51 0 32 0 115 0 101 0 114 0 118 0
+101 0 114 8 0 0 0 0 6 0 0 0 11 80 79 80 51 32 115 101
+114 118 101 114 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101 1
+3 0 0 0 22 0 83 0 77 0 84 0 80 0 32 0 115 0 101 0
+114 0 118 0 101 0 114 8 0 0 0 0 6 0 0 0 11 83 77 84
+80 32 115 101 114 118 101 114 7 0 0 0 10 68 111 87 104 97 116 80
+97 103 101 1 3 0 0 0 12 0 83 0 101 0 114 0 118 0 101 0
+114 8 0 0 0 0 6 0 0 0 6 83 101 114 118 101 114 7 0 0
+0 10 68 111 87 104 97 116 80 97 103 101 1 3 0 0 0 24 0 83
+0 121 0 110 0 107 0 114 0 111 0 110 0 105 0 115 0 101 0 114
+0 116 8 0 0 0 0 6 0 0 0 13 83 121 110 99 104 114 111 110
+111 117 115 108 121 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101
+1 3 0 0 0 40 0 78 0 -27 0 114 0 32 0 107 0 108 0 105
+0 101 0 110 0 116 0 32 0 102 0 114 0 97 0 107 0 111 0 98
+0 108 0 101 0 114 8 0 0 0 0 6 0 0 0 23 87 104 101 110
+32 99 108 105 101 110 116 32 100 105 115 99 111 110 110 101 99 116 115 7
+0 0 0 10 68 111 87 104 97 116 80 97 103 101 1 3 0 0 0 8
+0 104 0 118 0 101 0 114 8 0 0 0 0 6 0 0 0 5 101 118
+101 114 121 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101 1 3
+0 0 0 8 0 116 0 105 0 109 0 101 8 0 0 0 0 6 0 0
+0 4 104 111 117 114 7 0 0 0 10 68 111 87 104 97 116 80 97 103
+101 1 3 0 0 0 12 0 109 0 105 0 110 0 117 0 116 0 116 8
+0 0 0 0 6 0 0 0 6 109 105 110 117 116 101 7 0 0 0 10
+68 111 87 104 97 116 80 97 103 101 1 3 0 0 0 12 0 115 0 101
+0 107 0 117 0 110 0 100 8 0 0 0 0 6 0 0 0 6 115 101
+99 111 110 100 7 0 0 0 10 68 111 87 104 97 116 80 97 103 101 1
+3 0 0 0 50 0 114 0 101 0 100 0 105 0 103 0 101 0 114 0
+32 0 107 0 111 0 110 0 102 0 105 0 103 0 117 0 114 0 97 0
+115 0 106 0 111 0 110 0 115 0 102 0 105 0 108 8 0 0 0 0
+6 0 0 0 26 101 100 105 116 105 110 103 32 99 111 110 102 105 103 117
+114 97 116 105 111 110 32 102 105 108 101 7 0 0 0 14 69 100 105 116
+67 111 110 102 105 103 70 105 108 101 1 3 0 0 0 50 0 115 0 101
+0 116 0 116 0 101 0 114 0 32 0 103 0 114 0 117 0 112 0 112
+0 101 0 32 0 114 0 101 0 116 0 116 0 105 0 103 0 104 0 101
+0 116 0 101 0 114 8 0 0 0 0 6 0 0 0 25 115 101 116 116
+105 110 103 32 103 114 111 117 112 32 112 101 114 109 105 115 115 105 111 110
+115 7 0 0 0 9 70 105 108 101 71 114 111 117 112 1 3 0 0 0
+30 0 45 0 45 0 107 0 108 0 105 0 101 0 110 0 116 0 32 0
+102 0 105 0 108 0 116 0 101 0 114 8 0 0 0 0 6 0 0 0
+15 45 45 99 108 105 101 110 116 45 102 105 108 116 101 114 7 0 0 0
+10 70 105 108 116 101 114 80 97 103 101 1 3 0 0 0 16 0 45 0
+45 0 102 0 105 0 108 0 116 0 101 0 114 8 0 0 0 0 6 0
+0 0 8 45 45 102 105 108 116 101 114 7 0 0 0 10 70 105 108 116
+101 114 80 97 103 101 1 3 0 0 0 12 0 75 0 108 0 105 0 101
+0 110 0 116 8 0 0 0 0 6 0 0 0 6 67 108 105 101 110 116
+7 0 0 0 10 70 105 108 116 101 114 80 97 103 101 1 3 0 0 0
+12 0 75 0 111 0 112 0 105 0 101 0 114 8 0 0 0 0 6 0
+0 0 4 67 111 112 121 7 0 0 0 10 70 105 108 116 101 114 80 97
+103 101 1 3 0 0 0 14 0 70 0 105 0 108 0 116 0 101 0 114
+0 58 8 0 0 0 0 6 0 0 0 7 70 105 108 116 101 114 58 7
+0 0 0 10 70 105 108 116 101 114 80 97 103 101 1 3 0 0 0 14
+0 70 0 105 0 108 0 116 0 101 0 114 0 101 8 0 0 0 0 6
+0 0 0 7 70 105 108 116 101 114 115 7 0 0 0 10 70 105 108 116
+101 114 80 97 103 101 1 3 0 0 0 10 0 73 0 110 0 103 0 101
+0 110 8 0 0 0 0 6 0 0 0 4 78 111 110 101 7 0 0 0
+10 70 105 108 116 101 114 80 97 103 101 1 3 0 0 0 12 0 83 0
+107 0 114 0 105 0 112 0 116 8 0 0 0 0 6 0 0 0 6 83
+99 114 105 112 116 7 0 0 0 10 70 105 108 116 101 114 80 97 103 101
+1 3 0 0 0 12 0 83 0 101 0 114 0 118 0 101 0 114 8 0
+0 0 0 6 0 0 0 6 83 101 114 118 101 114 7 0 0 0 10 70
+105 108 116 101 114 80 97 103 101 1 3 0 0 0 14 0 83 0 112 0
+97 0 109 0 109 0 101 0 116 8 0 0 0 0 6 0 0 0 5 83
+112 97 109 100 7 0 0 0 10 70 105 108 116 101 114 80 97 103 101 1
+3 0 0 0 36 0 115 0 101 0 32 0 112 0 111 0 112 0 32 0
+115 0 101 0 114 0 118 0 101 0 114 0 32 0 115 0 105 0 100 0
+101 8 0 0 0 0 6 0 0 0 19 115 101 101 32 112 111 112 32 115
+101 114 118 101 114 32 112 97 103 101 7 0 0 0 10 70 105 108 116 101
+114 80 97 103 101 1 3 0 0 0 20 0 38 0 60 0 32 0 84 0
+105 0 108 0 98 0 97 0 107 0 101 8 0 0 0 0 6 0 0 0
+7 38 60 32 66 97 99 107 7 0 0 0 7 71 68 105 97 108 111 103
+1 3 0 0 0 16 0 38 0 65 0 118 0 115 0 108 0 117 0 116
+0 116 8 0 0 0 0 6 0 0 0 7 38 70 105 110 105 115 104 7
+0 0 0 7 71 68 105 97 108 111 103 1 3 0 0 0 12 0 65 0
+118 0 98 0 114 0 121 0 116 8 0 0 0 0 6 0 0 0 6 67
+97 110 99 101 108 7 0 0 0 7 71 68 105 97 108 111 103 1 3 0
+0 0 8 0 76 0 117 0 107 0 107 8 0 0 0 0 6 0 0 0
+5 67 108 111 115 101 7 0 0 0 7 71 68 105 97 108 111 103 1 3
+0 0 0 8 0 75 0 106 0 -8 0 114 8 0 0 0 0 6 0 0
+0 6 76 97 117 110 99 104 7 0 0 0 7 71 68 105 97 108 111 103
+1 3 0 0 0 16 0 78 0 101 0 115 0 116 0 101 0 32 0 38
+0 62 8 0 0 0 0 6 0 0 0 7 78 101 120 116 32 38 62 7
+0 0 0 7 71 68 105 97 108 111 103 1 3 0 0 0 84 0 80 0
+97 0 115 0 115 0 111 0 114 0 100 0 32 0 115 0 111 0 109 0
+32 0 115 0 107 0 97 0 108 0 32 0 108 0 101 0 103 0 103 0
+101 0 115 0 32 0 116 0 105 0 108 0 32 0 105 0 32 0 104 0
+101 0 109 0 109 0 101 0 108 0 105 0 103 0 32 0 102 0 105 0
+108 8 0 0 0 0 6 0 0 0 40 80 97 115 115 119 111 114 100 32
+116 111 32 98 101 32 97 100 100 101 100 32 116 111 32 116 104 101 32 115
+101 99 114 101 116 115 32 102 105 108 101 7 0 0 0 5 71 80 97 103
+101 1 3 0 0 0 90 0 66 0 114 0 117 0 107 0 101 0 114 0
+110 0 97 0 118 0 110 0 32 0 115 0 111 0 109 0 32 0 115 0
+107 0 97 0 108 0 32 0 108 0 101 0 103 0 103 0 101 0 115 0
+32 0 116 0 105 0 108 0 32 0 105 0 32 0 104 0 101 0 109 0
+109 0 101 0 108 0 105 0 103 0 32 0 102 0 105 0 108 8 0 0
+0 0 6 0 0 0 40 85 115 101 114 110 97 109 101 32 116 111 32 98
+101 32 97 100 100 101 100 32 116 111 32 116 104 101 32 115 101 99 114 101
+116 115 32 102 105 108 101 7 0 0 0 5 71 80 97 103 101 1 3 0
+0 0 48 0 103 0 101 0 110 0 101 0 114 0 101 0 114 0 101 0
+114 0 32 0 116 0 108 0 115 0 32 0 115 0 101 0 114 0 118 0
+101 0 114 0 32 0 107 0 101 0 121 8 0 0 0 0 6 0 0 0
+25 103 101 110 101 114 97 116 105 110 103 32 116 108 115 32 115 101 114 118
+101 114 32 107 101 121 7 0 0 0 11 71 101 110 101 114 97 116 101 75
+101 121 1 3 0 0 0 38 0 105 0 110 0 115 0 116 0 97 0 108
+0 108 0 101 0 114 0 101 0 114 0 32 0 115 0 101 0 114 0 118
+0 105 0 99 0 101 8 0 0 0 0 6 0 0 0 18 105 110 115 116
+97 108 108 105 110 103 32 115 101 114 118 105 99 101 7 0 0 0 14 73
+110 115 116 97 108 108 83 101 114 118 105 99 101 1 3 0 0 0 34 0
+105 0 110 0 103 0 101 0 110 0 116 0 105 0 110 0 103 0 32 0
+-27 0 32 0 103 0 106 0 -8 0 114 0 101 8 0 0 0 0 6 0
+0 0 13 110 111 116 104 105 110 103 32 116 111 32 100 111 7 0 0 0
+14 73 110 115 116 97 108 108 83 101 114 118 105 99 101 1 3 0 0 0
+24 0 97 0 118 0 105 0 110 0 115 0 116 0 97 0 108 0 108 0
+101 0 114 0 116 8 0 0 0 0 6 0 0 0 11 117 110 105 110 115
+116 97 108 108 101 100 7 0 0 0 14 73 110 115 116 97 108 108 83 101
+114 118 105 99 101 1 3 0 0 0 42 0 97 0 118 0 105 0 110 0
+115 0 116 0 97 0 108 0 108 0 101 0 114 0 101 0 114 0 32 0
+115 0 101 0 114 0 118 0 105 0 99 0 101 8 0 0 0 0 6 0
+0 0 20 117 110 105 110 115 116 97 108 108 105 110 103 32 115 101 114 118
+105 99 101 7 0 0 0 14 73 110 115 116 97 108 108 83 101 114 118 105
+99 101 1 3 0 0 0 30 0 42 0 42 0 32 0 109 0 105 0 115
+0 108 0 121 0 107 0 116 0 101 0 115 0 32 0 42 0 42 8 0
+0 0 0 6 0 0 0 12 42 42 32 102 97 105 108 101 100 32 42 42
+7 0 0 0 9 73 110 115 116 97 108 108 101 114 1 3 0 0 0 24
+0 61 0 61 0 32 0 102 0 101 0 114 0 100 0 105 0 103 0 32
+0 61 0 61 8 0 0 0 0 6 0 0 0 14 61 61 32 102 105 110
+105 115 104 101 100 32 61 61 7 0 0 0 9 73 110 115 116 97 108 108
+101 114 1 3 0 0 0 4 0 111 0 107 8 0 0 0 0 6 0 0
+0 2 111 107 7 0 0 0 9 73 110 115 116 97 108 108 101 114 1 3
+0 0 0 26 0 107 0 108 0 105 0 101 0 110 0 116 0 32 0 102
+0 105 0 108 0 116 0 101 0 114 8 0 0 0 0 6 0 0 0 13
+99 108 105 101 110 116 45 102 105 108 116 101 114 7 0 0 0 12 73 110
+115 116 97 108 108 101 114 73 109 112 1 3 0 0 0 26 0 107 0 111
+0 110 0 102 0 105 0 103 0 117 0 114 0 97 0 115 0 106 0 111
+0 110 8 0 0 0 0 6 0 0 0 13 99 111 110 102 105 103 117 114
+97 116 105 111 110 7 0 0 0 12 73 110 115 116 97 108 108 101 114 73
+109 112 1 3 0 0 0 12 0 102 0 105 0 108 0 116 0 101 0 114
+8 0 0 0 0 6 0 0 0 6 102 105 108 116 101 114 7 0 0 0
+12 73 110 115 116 97 108 108 101 114 73 109 112 1 3 0 0 0 18 0
+105 0 110 0 115 0 116 0 97 0 108 0 108 0 101 0 114 8 0 0
+0 0 6 0 0 0 7 105 110 115 116 97 108 108 7 0 0 0 12 73
+110 115 116 97 108 108 101 114 73 109 112 1 3 0 0 0 28 0 112 0
+111 0 112 0 32 0 101 0 116 0 116 0 101 0 114 0 32 0 110 0
+97 0 118 0 110 8 0 0 0 0 6 0 0 0 11 112 111 112 45 98
+121 45 110 97 109 101 7 0 0 0 12 73 110 115 116 97 108 108 101 114
+73 109 112 1 3 0 0 0 16 0 107 0 106 0 -8 0 114 0 101 0
+116 0 105 0 100 8 0 0 0 0 6 0 0 0 7 114 117 110 116 105
+109 101 7 0 0 0 12 73 110 115 116 97 108 108 101 114 73 109 112 1
+3 0 0 0 10 0 115 0 112 0 111 0 111 0 108 8 0 0 0 0
+6 0 0 0 5 115 112 111 111 108 7 0 0 0 12 73 110 115 116 97
+108 108 101 114 73 109 112 1 3 0 0 0 26 0 101 0 110 0 32 0
+97 0 110 0 110 0 101 0 110 0 32 0 102 0 101 0 105 0 108 8
+0 0 0 0 6 0 0 0 13 97 110 111 116 104 101 114 32 101 114 114
+111 114 7 0 0 0 11 74 117 115 116 84 101 115 116 105 110 103 1 3
+0 0 0 16 0 103 0 106 0 -8 0 114 0 32 0 110 0 111 0 101
+8 0 0 0 0 6 0 0 0 15 100 111 105 110 103 32 115 111 109 101
+116 104 105 110 103 7 0 0 0 11 74 117 115 116 84 101 115 116 105 110
+103 1 3 0 0 0 34 0 105 0 110 0 103 0 101 0 110 0 116 0
+105 0 110 0 103 0 32 0 -27 0 32 0 103 0 106 0 -8 0 114 0
+101 8 0 0 0 0 6 0 0 0 13 110 111 116 104 105 110 103 32 116
+111 32 100 111 7 0 0 0 11 74 117 115 116 84 101 115 116 105 110 103
+1 3 0 0 0 18 0 110 0 111 0 101 0 110 0 32 0 102 0 101
+0 105 0 108 8 0 0 0 0 6 0 0 0 10 115 111 109 101 32 101
+114 114 111 114 7 0 0 0 11 74 117 115 116 84 101 115 116 105 110 103
+1 3 0 0 0 12 0 102 0 101 0 114 0 100 0 105 0 103 8 0
+0 0 0 6 0 0 0 4 100 111 110 101 7 0 0 0 8 76 97 117
+110 99 104 101 114 1 3 0 0 0 12 0 107 0 106 0 -8 0 114 0
+101 0 114 8 0 0 0 0 6 0 0 0 7 114 117 110 110 105 110 103
+7 0 0 0 8 76 97 117 110 99 104 101 114 1 3 0 0 0 50 0
+107 0 106 0 -8 0 114 0 101 0 114 0 32 0 111 0 112 0 112 0
+115 0 116 0 97 0 114 0 116 0 32 0 98 0 97 0 116 0 99 0
+104 0 32 0 102 0 105 0 108 8 0 0 0 0 6 0 0 0 26 114
+117 110 110 105 110 103 32 115 116 97 114 116 117 112 32 98 97 116 99 104
+32 102 105 108 101 7 0 0 0 8 76 97 117 110 99 104 101 114 1 3
+0 0 0 30 0 115 0 116 0 97 0 114 0 116 0 101 0 114 0 32
+0 115 0 101 0 114 0 118 0 105 0 99 0 101 8 0 0 0 0 6
+0 0 0 16 115 116 97 114 116 105 110 103 32 115 101 114 118 105 99 101
+7 0 0 0 8 76 97 117 110 99 104 101 114 1 3 0 0 0 98 0
+74 0 101 0 103 0 32 0 103 0 111 0 100 0 116 0 97 0 114 0
+32 0 118 0 105 0 108 0 107 0 -27 0 114 0 101 0 110 0 101 0
+32 0 111 0 103 0 32 0 98 0 101 0 116 0 105 0 110 0 103 0
+101 0 108 0 115 0 101 0 110 0 101 0 32 0 102 0 111 0 114 0
+32 0 108 0 105 0 115 0 101 0 110 0 115 0 101 0 110 8 0 0
+0 0 6 0 0 0 50 73 32 97 103 114 101 101 32 116 111 32 116 104
+101 32 116 101 114 109 115 32 97 110 100 32 99 111 110 100 105 116 105 111
+110 115 32 111 102 32 116 104 101 32 108 105 99 101 110 115 101 7 0 0
+0 11 76 105 99 101 110 115 101 80 97 103 101 1 3 0 0 0 12 0
+76 0 105 0 115 0 101 0 110 0 115 8 0 0 0 0 6 0 0 0
+7 76 105 99 101 110 115 101 7 0 0 0 11 76 105 99 101 110 115 101
+80 97 103 101 1 3 0 0 0 26 0 45 0 45 0 103 0 114 0 101
+0 110 0 115 0 101 0 115 0 110 0 105 0 116 0 116 8 0 0 0
+0 6 0 0 0 11 45 45 105 110 116 101 114 102 97 99 101 7 0 0
+0 13 76 105 115 116 101 110 105 110 103 80 97 103 101 1 3 0 0 0
+38 0 45 0 45 0 101 0 107 0 115 0 116 0 101 0 114 0 110 0
+101 0 32 0 107 0 108 0 105 0 101 0 110 0 116 0 101 0 114 8
+0 0 0 0 6 0 0 0 16 45 45 114 101 109 111 116 101 45 99 108
+105 101 110 116 115 7 0 0 0 13 76 105 115 116 101 110 105 110 103 80
+97 103 101 1 3 0 0 0 48 0 84 0 105 0 108 0 108 0 97 0
+116 0 32 0 101 0 107 0 115 0 116 0 101 0 114 0 110 0 101 0
+32 0 107 0 108 0 105 0 101 0 110 0 116 0 101 0 114 8 0 0
+0 0 6 0 0 0 20 65 108 108 111 119 32 114 101 109 111 116 101 32
+99 108 105 101 110 116 115 7 0 0 0 13 76 105 115 116 101 110 105 110
+103 80 97 103 101 1 3 0 0 0 46 0 72 0 118 0 105 0 108 0
+107 0 101 0 110 0 32 0 115 0 111 0 109 0 32 0 104 0 101 0
+108 0 115 0 116 0 32 0 73 0 80 0 118 0 38 0 52 8 0 0
+0 0 6 0 0 0 9 65 110 121 32 73 80 118 38 52 7 0 0 0
+13 76 105 115 116 101 110 105 110 103 80 97 103 101 1 3 0 0 0 46
+0 72 0 118 0 105 0 108 0 107 0 101 0 110 0 32 0 115 0 111
+0 109 0 32 0 104 0 101 0 108 0 115 0 116 0 32 0 73 0 80
+0 118 0 38 0 54 8 0 0 0 0 6 0 0 0 9 65 110 121 32
+73 80 118 38 54 7 0 0 0 13 76 105 115 116 101 110 105 110 103 80
+97 103 101 1 3 0 0 0 50 0 72 0 118 0 105 0 108 0 107 0
+101 0 110 0 32 0 97 0 100 0 114 0 101 0 115 0 115 0 101 0
+32 0 115 0 111 0 109 0 32 0 104 0 101 0 108 0 115 0 116 8
+0 0 0 0 6 0 0 0 11 65 110 121 32 97 100 100 114 101 115 115
+7 0 0 0 13 76 105 115 116 101 110 105 110 103 80 97 103 101 1 3
+0 0 0 16 0 75 0 108 0 105 0 101 0 110 0 116 0 101 0 114
+8 0 0 0 0 6 0 0 0 7 67 108 105 101 110 116 115 7 0 0
+0 13 76 105 115 116 101 110 105 110 103 80 97 103 101 1 3 0 0 0
+24 0 84 0 105 0 108 0 107 0 111 0 98 0 108 0 105 0 110 0
+103 0 101 0 114 8 0 0 0 0 6 0 0 0 11 67 111 110 110 101
+99 116 105 111 110 115 7 0 0 0 13 76 105 115 116 101 110 105 110 103
+80 97 103 101 1 3 0 0 0 8 0 76 0 121 0 116 0 116 8 0
+0 0 0 6 0 0 0 4 76 105 115 116 7 0 0 0 13 76 105 115
+116 101 110 105 110 103 80 97 103 101 1 3 0 0 0 14 0 76 0 121
+0 116 0 116 0 32 0 112 0 -27 8 0 0 0 0 6 0 0 0 9
+76 105 115 116 101 110 32 111 110 7 0 0 0 13 76 105 115 116 101 110
+105 110 103 80 97 103 101 1 3 0 0 0 18 0 76 0 111 0 99 0
+97 0 108 0 104 0 111 0 115 0 116 8 0 0 0 0 6 0 0 0
+9 76 111 99 97 108 104 111 115 116 7 0 0 0 13 76 105 115 116 101
+110 105 110 103 80 97 103 101 1 3 0 0 0 14 0 45 0 45 0 100
+0 101 0 98 0 117 0 103 8 0 0 0 0 6 0 0 0 7 45 45
+100 101 98 117 103 7 0 0 0 11 76 111 103 103 105 110 103 80 97 103
+101 1 3 0 0 0 26 0 45 0 45 0 108 0 111 0 103 0 103 0
+97 0 100 0 114 0 101 0 115 0 115 0 101 8 0 0 0 0 6 0
+0 0 13 45 45 108 111 103 45 97 100 100 114 101 115 115 7 0 0 0
+11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 18 0 45
+0 45 0 108 0 111 0 103 0 103 0 102 0 105 0 108 8 0 0 0
+0 6 0 0 0 10 45 45 108 111 103 45 102 105 108 101 7 0 0 0
+11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 18 0 45
+0 45 0 108 0 111 0 103 0 103 0 116 0 105 0 100 8 0 0 0
+0 6 0 0 0 10 45 45 108 111 103 45 116 105 109 101 7 0 0 0
+11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 16 0 45
+0 45 0 115 0 121 0 115 0 108 0 111 0 103 8 0 0 0 0 6
+0 0 0 8 45 45 115 121 115 108 111 103 7 0 0 0 11 76 111 103
+103 105 110 103 80 97 103 101 1 3 0 0 0 22 0 45 0 45 0 100
+0 101 0 116 0 97 0 108 0 106 0 101 0 114 0 116 8 0 0 0
+0 6 0 0 0 9 45 45 118 101 114 98 111 115 101 7 0 0 0 11
+76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 14 0 85 0
+116 0 102 0 111 0 114 0 115 0 107 8 0 0 0 0 6 0 0 0
+6 66 114 111 119 115 101 7 0 0 0 11 76 111 103 103 105 110 103 80
+97 103 101 1 3 0 0 0 34 0 70 0 101 0 105 0 108 0 115 0
+-8 0 107 0 32 0 109 0 101 0 108 0 100 0 105 0 110 0 103 0
+101 0 114 8 0 0 0 0 6 0 0 0 14 68 101 98 117 103 32 109
+101 115 115 97 103 101 115 7 0 0 0 11 76 111 103 103 105 110 103 80
+97 103 101 1 3 0 0 0 36 0 69 0 107 0 115 0 116 0 114 0
+97 0 32 0 105 0 110 0 102 0 111 0 114 0 109 0 97 0 115 0
+106 0 111 0 110 8 0 0 0 0 6 0 0 0 17 69 120 116 114 97
+32 105 110 102 111 114 109 97 116 105 111 110 7 0 0 0 11 76 111 103
+103 105 110 103 80 97 103 101 1 3 0 0 0 10 0 76 0 101 0 118
+0 101 0 108 8 0 0 0 0 6 0 0 0 5 76 101 118 101 108 7
+0 0 0 11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0
+16 0 76 0 111 0 103 0 103 0 102 0 105 0 108 0 58 8 0 0
+0 0 6 0 0 0 9 76 111 103 32 102 105 108 101 58 7 0 0 0
+11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 14 0 76
+0 111 0 103 0 103 0 105 0 110 0 103 8 0 0 0 0 6 0 0
+0 7 76 111 103 103 105 110 103 7 0 0 0 11 76 111 103 103 105 110
+103 80 97 103 101 1 3 0 0 0 30 0 78 0 101 0 116 0 118 0
+101 0 114 0 107 0 115 0 97 0 100 0 114 0 101 0 115 0 115 0
+101 8 0 0 0 0 6 0 0 0 17 78 101 116 119 111 114 107 32 97
+100 100 114 101 115 115 101 115 7 0 0 0 11 76 111 103 103 105 110 103
+80 97 103 101 1 3 0 0 0 12 0 79 0 117 0 116 0 112 0 117
+0 116 8 0 0 0 0 6 0 0 0 6 79 117 116 112 117 116 7 0
+0 0 11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0 0 20
+0 84 0 105 0 109 0 101 0 115 0 116 0 97 0 109 0 112 0 115
+8 0 0 0 0 6 0 0 0 10 84 105 109 101 115 116 97 109 112 115
+7 0 0 0 11 76 111 103 103 105 110 103 80 97 103 101 1 3 0 0
+0 34 0 68 0 101 0 116 0 97 0 108 0 106 0 101 0 114 0 116
+0 32 0 108 0 111 0 103 0 103 0 105 0 110 0 103 8 0 0 0
+0 6 0 0 0 15 86 101 114 98 111 115 101 32 108 111 103 103 105 110
+103 7 0 0 0 11 76 111 103 103 105 110 103 80 97 103 101 1 3 0
+0 0 34 0 115 0 107 0 114 0 105 0 118 0 32 0 116 0 105 0
+108 0 32 0 108 0 111 0 103 0 103 0 102 0 105 0 108 8 0 0
+0 0 6 0 0 0 17 87 114 105 116 101 32 116 111 32 108 111 103 32
+102 105 108 101 7 0 0 0 11 76 111 103 103 105 110 103 80 97 103 101
+1 3 0 0 0 42 0 115 0 107 0 114 0 105 0 118 0 32 0 116
+0 105 0 108 0 32 0 115 0 121 0 115 0 116 0 101 0 109 0 32
+0 108 0 111 0 103 0 103 8 0 0 0 0 6 0 0 0 23 87 114
+105 116 101 32 116 111 32 116 104 101 32 115 121 115 116 101 109 32 108 111
+103 7 0 0 0 11 76 111 103 103 105 110 103 80 97 103 101 1 3 0
+0 0 62 0 45 0 45 0 102 0 105 0 108 0 116 0 101 0 114 0
+61 0 101 0 109 0 97 0 105 0 108 0 114 0 101 0 108 0 97 0
+121 0 45 0 102 0 105 0 108 0 116 0 101 0 114 0 45 0 107 0
+111 0 112 0 105 8 0 0 0 0 6 0 0 0 31 45 45 102 105 108
+116 101 114 61 101 109 97 105 108 114 101 108 97 121 45 102 105 108 116 101
+114 45 99 111 112 121 7 0 0 0 7 80 111 112 80 97 103 101 1 3
+0 0 0 32 0 45 0 45 0 112 0 111 0 112 0 32 0 101 0 116
+0 116 0 101 0 114 0 32 0 110 0 97 0 118 0 110 8 0 0 0
+0 6 0 0 0 13 45 45 112 111 112 45 98 121 45 110 97 109 101 7
+0 0 0 7 80 111 112 80 97 103 101 1 3 0 0 0 32 0 45 0
+45 0 112 0 111 0 112 0 32 0 105 0 107 0 107 0 101 0 32 0
+115 0 108 0 101 0 116 0 116 8 0 0 0 0 6 0 0 0 15 45
+45 112 111 112 45 110 111 45 100 101 108 101 116 101 7 0 0 0 7 80
+111 112 80 97 103 101 1 3 0 0 0 20 0 45 0 45 0 112 0 111
+0 112 0 32 0 112 0 111 0 114 0 116 8 0 0 0 0 6 0 0
+0 10 45 45 112 111 112 45 112 111 114 116 7 0 0 0 7 80 111 112
+80 97 103 101 1 3 0 0 0 14 0 75 0 111 0 110 0 116 0 111
+0 101 0 114 8 0 0 0 0 6 0 0 0 8 65 99 99 111 117 110
+116 115 7 0 0 0 7 80 111 112 80 97 103 101 1 3 0 0 0 28
+0 75 0 108 0 105 0 101 0 110 0 116 0 32 0 107 0 111 0 110
+0 116 0 111 0 101 0 114 8 0 0 0 0 6 0 0 0 15 67 108
+105 101 110 116 32 97 99 99 111 117 110 116 115 7 0 0 0 7 80 111
+112 80 97 103 101 1 3 0 0 0 60 0 107 0 111 0 112 0 105 0
+101 0 114 0 32 0 83 0 77 0 84 0 80 0 32 0 109 0 101 0
+108 0 100 0 105 0 110 0 103 0 101 0 114 0 32 0 116 0 105 0
+108 0 32 0 97 0 108 0 108 0 101 8 0 0 0 0 6 0 0 0
+25 67 111 112 121 32 83 77 84 80 32 109 101 115 115 97 103 101 115 32
+116 111 32 97 108 108 7 0 0 0 7 80 111 112 80 97 103 101 1 3
+0 0 0 52 0 68 0 101 0 97 0 107 0 116 0 105 0 118 0 101
+0 114 0 32 0 109 0 101 0 108 0 100 0 105 0 110 0 103 0 32
+0 115 0 108 0 101 0 116 0 116 0 105 0 110 0 103 8 0 0 0
+0 6 0 0 0 24 68 105 115 97 98 108 101 32 109 101 115 115 97 103
+101 32 100 101 108 101 116 105 111 110 7 0 0 0 7 80 111 112 80 97
+103 101 1 3 0 0 0 24 0 76 0 111 0 107 0 97 0 108 0 32
+0 115 0 101 0 114 0 118 0 101 0 114 8 0 0 0 0 6 0 0
+0 12 76 111 99 97 108 32 115 101 114 118 101 114 7 0 0 0 7 80
+111 112 80 97 103 101 1 3 0 0 0 70 0 77 0 97 0 110 0 103
+0 101 0 32 0 107 0 108 0 105 0 101 0 110 0 116 0 101 0 114
+0 32 0 100 0 101 0 108 0 101 0 114 0 32 0 101 0 110 0 32
+0 115 0 112 0 111 0 111 0 108 0 32 0 109 0 97 0 112 0 112
+0 101 8 0 0 0 0 6 0 0 0 38 77 97 110 121 32 99 108 105
+101 110 116 115 32 115 104 97 114 105 110 103 32 97 32 115 112 111 111 108
+32 100 105 114 101 99 116 111 114 121 7 0 0 0 7 80 111 112 80 97
+103 101 1 3 0 0 0 80 0 77 0 97 0 110 0 103 0 101 0 32
+0 107 0 108 0 105 0 101 0 110 0 116 0 101 0 114 0 32 0 109
+0 101 0 100 0 32 0 115 0 101 0 112 0 97 0 114 0 97 0 116
+0 101 0 32 0 115 0 112 0 111 0 111 0 108 0 32 0 109 0 97
+0 112 0 112 0 101 0 114 8 0 0 0 0 6 0 0 0 44 77 97
+110 121 32 99 108 105 101 110 116 115 32 119 105 116 104 32 115 101 112 97
+114 97 116 101 32 115 112 111 111 108 32 100 105 114 101 99 116 111 114 105
+101 115 7 0 0 0 7 80 111 112 80 97 103 101 1 3 0 0 0 10
+0 78 0 97 0 118 0 110 0 58 8 0 0 0 0 6 0 0 0 5
+78 97 109 101 58 7 0 0 0 7 80 111 112 80 97 103 101 1 3 0
+0 0 22 0 78 0 121 0 101 0 32 0 107 0 111 0 110 0 116 0
+111 0 101 0 114 8 0 0 0 0 6 0 0 0 12 78 101 119 32 65
+99 99 111 117 110 116 115 7 0 0 0 7 80 111 112 80 97 103 101 1
+3 0 0 0 18 0 69 0 110 0 32 0 107 0 108 0 105 0 101 0
+110 0 116 8 0 0 0 0 6 0 0 0 10 79 110 101 32 99 108 105
+101 110 116 7 0 0 0 7 80 111 112 80 97 103 101 1 3 0 0 0
+20 0 80 0 79 0 80 0 32 0 115 0 101 0 114 0 118 0 101 0
+114 8 0 0 0 0 6 0 0 0 10 80 79 80 32 115 101 114 118 101
+114 7 0 0 0 7 80 111 112 80 97 103 101 1 3 0 0 0 16 0
+80 0 97 0 115 0 115 0 111 0 114 0 100 0 58 8 0 0 0 0
+6 0 0 0 9 80 97 115 115 119 111 114 100 58 7 0 0 0 7 80
+111 112 80 97 103 101 1 3 0 0 0 10 0 80 0 111 0 114 0 116
+0 58 8 0 0 0 0 6 0 0 0 5 80 111 114 116 58 7 0 0
+0 7 80 111 112 80 97 103 101 1 3 0 0 0 22 0 37 0 49 0
+32 0 91 0 37 0 50 0 93 0 46 0 46 0 46 0 32 8 0 0
+0 0 6 0 0 0 11 37 49 32 91 37 50 93 46 46 46 32 7 0
+0 0 12 80 114 111 103 114 101 115 115 80 97 103 101 1 3 0 0 0
+26 0 37 0 49 0 32 0 91 0 37 0 51 0 93 0 46 0 46 0
+46 0 32 0 37 0 50 8 0 0 0 0 6 0 0 0 13 37 49 32
+91 37 51 93 46 46 46 32 37 50 7 0 0 0 12 80 114 111 103 114
+101 115 115 80 97 103 101 1 3 0 0 0 26 0 37 0 49 0 32 0
+91 0 37 0 51 0 93 0 46 0 46 0 46 0 32 0 37 0 50 8
+0 0 0 1 54 6 0 0 0 13 37 49 32 91 37 51 93 46 46 46
+32 37 50 7 0 0 0 12 80 114 111 103 114 101 115 115 80 97 103 101
+1 3 0 0 0 26 0 37 0 49 0 32 0 91 0 37 0 51 0 93
+0 46 0 46 0 46 0 32 0 37 0 50 8 0 0 0 1 56 6 0
+0 0 13 37 49 32 91 37 51 93 46 46 46 32 37 50 7 0 0 0
+12 80 114 111 103 114 101 115 115 80 97 103 101 1 3 0 0 0 34 0
+37 0 49 0 32 0 91 0 37 0 51 0 93 0 46 0 46 0 46 0
+32 0 37 0 50 0 58 0 32 0 37 0 52 8 0 0 0 0 6 0
+0 0 17 37 49 32 91 37 51 93 46 46 46 32 37 50 58 32 37 52
+7 0 0 0 12 80 114 111 103 114 101 115 115 80 97 103 101 1 3 0
+0 0 12 0 37 0 49 0 46 0 46 0 46 0 32 8 0 0 0 0
+6 0 0 0 6 37 49 46 46 46 32 7 0 0 0 12 80 114 111 103
+114 101 115 115 80 97 103 101 1 3 0 0 0 16 0 37 0 49 0 46
+0 46 0 46 0 32 0 37 0 50 8 0 0 0 0 6 0 0 0 8
+37 49 46 46 46 32 37 50 7 0 0 0 12 80 114 111 103 114 101 115
+115 80 97 103 101 1 3 0 0 0 16 0 37 0 49 0 46 0 46 0
+46 0 32 0 37 0 50 8 0 0 0 1 53 6 0 0 0 8 37 49
+46 46 46 32 37 50 7 0 0 0 12 80 114 111 103 114 101 115 115 80
+97 103 101 1 3 0 0 0 16 0 37 0 49 0 46 0 46 0 46 0
+32 0 37 0 50 8 0 0 0 1 55 6 0 0 0 8 37 49 46 46
+46 32 37 50 7 0 0 0 12 80 114 111 103 114 101 115 115 80 97 103
+101 1 3 0 0 0 24 0 37 0 49 0 46 0 46 0 46 0 32 0
+37 0 50 0 58 0 32 0 37 0 51 8 0 0 0 0 6 0 0 0
+12 37 49 46 46 46 32 37 50 58 32 37 51 7 0 0 0 12 80 114
+111 103 114 101 115 115 80 97 103 101 1 3 0 0 0 22 0 73 0 110
+0 115 0 116 0 97 0 108 0 108 0 101 0 114 0 101 0 114 8 0
+0 0 0 6 0 0 0 10 73 110 115 116 97 108 108 105 110 103 7 0
+0 0 12 80 114 111 103 114 101 115 115 80 97 103 101 1 3 0 0 0
+70 0 69 0 45 0 77 0 97 0 105 0 108 0 82 0 101 0 108 0
+97 0 121 0 32 0 118 0 105 0 108 0 32 0 110 0 -27 0 32 0
+98 0 108 0 105 0 32 0 107 0 111 0 110 0 102 0 105 0 103 0
+117 0 114 0 101 0 114 0 116 0 46 8 0 0 0 0 6 0 0 0
+35 69 45 77 97 105 108 82 101 108 97 121 32 119 105 108 108 32 110 111
+119 32 98 101 32 99 111 110 102 105 103 117 114 101 100 46 7 0 0 0
+9 82 101 97 100 121 80 97 103 101 1 3 0 0 0 68 0 69 0 45
+0 77 0 97 0 105 0 108 0 82 0 101 0 108 0 97 0 121 0 32
+0 118 0 105 0 108 0 32 0 110 0 -27 0 32 0 98 0 108 0 105
+0 32 0 105 0 110 0 115 0 116 0 97 0 108 0 108 0 101 0 114
+0 116 0 46 8 0 0 0 0 6 0 0 0 34 69 45 77 97 105 108
+82 101 108 97 121 32 119 105 108 108 32 110 111 119 32 98 101 32 105 110
+115 116 97 108 108 101 100 46 7 0 0 0 9 82 101 97 100 121 80 97
+103 101 1 3 0 0 0 44 0 75 0 108 0 97 0 114 0 32 0 116
+0 105 0 108 0 32 0 107 0 111 0 110 0 102 0 105 0 103 0 117
+0 114 0 101 0 114 0 105 0 110 0 103 8 0 0 0 0 6 0 0
+0 18 82 101 97 100 121 32 116 111 32 99 111 110 102 105 103 117 114 101
+7 0 0 0 9 82 101 97 100 121 80 97 103 101 1 3 0 0 0 42
+0 75 0 108 0 97 0 114 0 32 0 116 0 105 0 108 0 32 0 105
+0 110 0 115 0 116 0 97 0 108 0 108 0 101 0 114 0 105 0 110
+0 103 8 0 0 0 0 6 0 0 0 16 82 101 97 100 121 32 116 111
+32 105 110 115 116 97 108 108 7 0 0 0 9 82 101 97 100 121 80 97
+103 101 1 3 0 0 0 102 0 114 0 101 0 103 0 105 0 115 0 116
+0 114 0 101 0 114 0 101 0 115 0 32 0 115 0 111 0 109 0 32
+0 101 0 110 0 32 0 107 0 105 0 108 0 100 0 101 0 32 0 102
+0 111 0 114 0 32 0 108 0 111 0 103 0 103 0 105 0 110 0 103
+0 32 0 105 0 32 0 101 0 118 0 101 0 110 0 116 0 32 0 118
+0 105 0 101 0 119 0 101 0 114 8 0 0 0 0 6 0 0 0 48
+114 101 103 105 115 116 101 114 105 110 103 32 97 115 32 97 32 115 111 117
+114 99 101 32 102 111 114 32 101 118 101 110 116 32 118 105 101 119 101 114
+32 108 111 103 103 105 110 103 7 0 0 0 21 82 101 103 105 115 116 101
+114 65 115 69 118 101 110 116 83 111 117 114 99 101 1 3 0 0 0 26
+0 45 0 45 0 107 0 108 0 105 0 101 0 110 0 116 0 45 0 97
+0 117 0 116 0 104 8 0 0 0 0 6 0 0 0 13 45 45 99 108
+105 101 110 116 45 97 117 116 104 7 0 0 0 14 83 109 116 112 67 108
+105 101 110 116 80 97 103 101 1 3 0 0 0 24 0 45 0 45 0 107
+0 108 0 105 0 101 0 110 0 116 0 32 0 116 0 108 0 115 8 0
+0 0 0 6 0 0 0 12 45 45 99 108 105 101 110 116 45 116 108 115
+7 0 0 0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1
+3 0 0 0 74 0 45 0 45 0 107 0 108 0 105 0 101 0 110 0
+116 0 45 0 116 0 108 0 115 0 44 0 32 0 45 0 45 0 107 0
+108 0 105 0 101 0 110 0 116 0 45 0 116 0 108 0 115 0 45 0
+116 0 105 0 108 0 107 0 111 0 98 0 108 0 105 0 110 0 103 8
+0 0 0 0 6 0 0 0 37 45 45 99 108 105 101 110 116 45 116 108
+115 44 32 45 45 99 108 105 101 110 116 45 116 108 115 45 99 111 110 110
+101 99 116 105 111 110 7 0 0 0 14 83 109 116 112 67 108 105 101 110
+116 80 97 103 101 1 3 0 0 0 46 0 45 0 45 0 107 0 108 0
+105 0 101 0 110 0 116 0 45 0 116 0 108 0 115 0 45 0 116 0
+105 0 108 0 107 0 111 0 98 0 108 0 105 0 110 0 103 8 0 0
+0 0 6 0 0 0 23 45 45 99 108 105 101 110 116 45 116 108 115 45
+99 111 110 110 101 99 116 105 111 110 7 0 0 0 14 83 109 116 112 67
+108 105 101 110 116 80 97 103 101 1 3 0 0 0 32 0 45 0 45 0
+118 0 105 0 100 0 101 0 114 0 101 0 115 0 101 0 110 0 100 0
+32 0 116 0 105 0 108 8 0 0 0 0 6 0 0 0 12 45 45 102
+111 114 119 97 114 100 45 116 111 7 0 0 0 14 83 109 116 112 67 108
+105 101 110 116 80 97 103 101 1 3 0 0 0 10 0 75 0 111 0 110
+0 116 0 111 8 0 0 0 0 6 0 0 0 7 65 99 99 111 117 110
+116 7 0 0 0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101
+1 3 0 0 0 26 0 65 0 117 0 116 0 101 0 110 0 116 0 105
+0 115 0 101 0 114 0 105 0 110 0 103 8 0 0 0 0 6 0 0
+0 14 65 117 116 104 101 110 116 105 99 97 116 105 111 110 7 0 0 0
+14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0 0
+18 0 72 0 111 0 115 0 116 0 110 0 97 0 118 0 110 0 58 8
+0 0 0 0 6 0 0 0 9 72 111 115 116 110 97 109 101 58 7 0
+0 0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1 3 0
+0 0 42 0 73 0 109 0 112 0 108 0 105 0 115 0 105 0 116 0
+116 0 32 0 84 0 76 0 83 0 32 0 40 0 115 0 109 0 116 0
+112 0 115 0 41 8 0 0 0 0 6 0 0 0 20 73 109 112 108 105
+99 105 116 32 84 76 83 32 40 115 109 116 112 115 41 7 0 0 0 14
+83 109 116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0 0 10
+0 78 0 97 0 118 0 110 0 58 8 0 0 0 0 6 0 0 0 5
+78 97 109 101 58 7 0 0 0 14 83 109 116 112 67 108 105 101 110 116
+80 97 103 101 1 3 0 0 0 16 0 78 0 121 0 32 0 107 0 111
+0 110 0 116 0 111 8 0 0 0 0 6 0 0 0 11 78 101 119 32
+65 99 99 111 117 110 116 7 0 0 0 14 83 109 116 112 67 108 105 101
+110 116 80 97 103 101 1 3 0 0 0 16 0 80 0 97 0 115 0 115
+0 111 0 114 0 100 0 58 8 0 0 0 0 6 0 0 0 9 80 97
+115 115 119 111 114 100 58 7 0 0 0 14 83 109 116 112 67 108 105 101
+110 116 80 97 103 101 1 3 0 0 0 10 0 80 0 111 0 114 0 116
+0 58 8 0 0 0 0 6 0 0 0 5 80 111 114 116 58 7 0 0
+0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0
+0 28 0 69 0 107 0 115 0 116 0 101 0 114 0 110 0 32 0 115
+0 101 0 114 0 118 0 101 0 114 8 0 0 0 0 6 0 0 0 13
+82 101 109 111 116 101 32 115 101 114 118 101 114 7 0 0 0 14 83 109
+116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0 0 22 0 83
+0 77 0 84 0 80 0 32 0 107 0 108 0 105 0 101 0 110 0 116
+8 0 0 0 0 6 0 0 0 11 83 77 84 80 32 99 108 105 101 110
+116 7 0 0 0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101
+1 3 0 0 0 16 0 83 0 84 0 65 0 82 0 84 0 84 0 76
+0 83 8 0 0 0 0 6 0 0 0 8 83 84 65 82 84 84 76 83
+7 0 0 0 14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1
+3 0 0 0 40 0 84 0 105 0 108 0 102 0 -8 0 114 0 32 0
+97 0 117 0 116 0 101 0 110 0 116 0 105 0 115 0 101 0 114 0
+105 0 110 0 103 8 0 0 0 0 6 0 0 0 21 83 117 112 112 108
+121 32 97 117 116 104 101 110 116 105 99 97 116 105 111 110 7 0 0 0
+14 83 109 116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0 0
+28 0 84 0 76 0 83 0 32 0 107 0 114 0 121 0 112 0 116 0
+101 0 114 0 105 0 110 0 103 8 0 0 0 0 6 0 0 0 14 84
+76 83 32 101 110 99 114 121 112 116 105 111 110 7 0 0 0 14 83 109
+116 112 67 108 105 101 110 116 80 97 103 101 1 3 0 0 0 38 0 66
+0 114 0 117 0 107 0 32 0 84 0 76 0 83 0 32 0 107 0 114
+0 121 0 112 0 116 0 101 0 114 0 105 0 110 0 103 8 0 0 0
+0 6 0 0 0 18 85 115 101 32 84 76 83 32 101 110 99 114 121 112
+116 105 111 110 7 0 0 0 14 83 109 116 112 67 108 105 101 110 116 80
+97 103 101 1 3 0 0 0 12 0 45 0 45 0 112 0 111 0 114 0
+116 8 0 0 0 0 6 0 0 0 6 45 45 112 111 114 116 7 0 0
+0 14 83 109 116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0
+0 26 0 45 0 45 0 115 0 101 0 114 0 118 0 101 0 114 0 45
+0 97 0 117 0 116 0 104 8 0 0 0 0 6 0 0 0 13 45 45
+115 101 114 118 101 114 45 97 117 116 104 7 0 0 0 14 83 109 116 112
+83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 24 0 45 0 45
+0 115 0 101 0 114 0 118 0 101 0 114 0 45 0 116 0 108 0 115
+8 0 0 0 0 6 0 0 0 12 45 45 115 101 114 118 101 114 45 116
+108 115 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97 103
+101 1 3 0 0 0 74 0 45 0 45 0 115 0 101 0 114 0 118 0
+101 0 114 0 45 0 116 0 108 0 115 0 44 0 32 0 45 0 45 0
+115 0 101 0 114 0 118 0 101 0 114 0 45 0 116 0 108 0 115 0
+45 0 116 0 105 0 108 0 107 0 111 0 98 0 108 0 105 0 110 0
+103 8 0 0 0 0 6 0 0 0 37 45 45 115 101 114 118 101 114 45
+116 108 115 44 32 45 45 115 101 114 118 101 114 45 116 108 115 45 99 111
+110 110 101 99 116 105 111 110 7 0 0 0 14 83 109 116 112 83 101 114
+118 101 114 80 97 103 101 1 3 0 0 0 46 0 45 0 45 0 115 0
+101 0 114 0 118 0 101 0 114 0 45 0 116 0 108 0 115 0 45 0
+115 0 101 0 114 0 116 0 105 0 102 0 105 0 107 0 97 0 116 8
+0 0 0 0 6 0 0 0 24 45 45 115 101 114 118 101 114 45 116 108
+115 45 99 101 114 116 105 102 105 99 97 116 101 7 0 0 0 14 83 109
+116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 46 0 45
+0 45 0 115 0 101 0 114 0 118 0 101 0 114 0 45 0 116 0 108
+0 115 0 45 0 116 0 105 0 108 0 107 0 111 0 98 0 108 0 105
+0 110 0 103 8 0 0 0 0 6 0 0 0 23 45 45 115 101 114 118
+101 114 45 116 108 115 45 99 111 110 110 101 99 116 105 111 110 7 0 0
+0 14 83 109 116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0
+0 10 0 75 0 111 0 110 0 116 0 111 8 0 0 0 0 6 0 0
+0 7 65 99 99 111 117 110 116 7 0 0 0 14 83 109 116 112 83 101
+114 118 101 114 80 97 103 101 1 3 0 0 0 26 0 65 0 117 0 116
+0 101 0 110 0 116 0 105 0 115 0 101 0 114 0 105 0 110 0 103
+8 0 0 0 0 6 0 0 0 14 65 117 116 104 101 110 116 105 99 97
+116 105 111 110 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80
+97 103 101 1 3 0 0 0 14 0 85 0 116 0 102 0 111 0 114 0
+115 0 107 8 0 0 0 0 6 0 0 0 6 66 114 111 119 115 101 7
+0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97 103 101 1 3
+0 0 0 22 0 83 0 101 0 114 0 116 0 105 0 102 0 105 0 107
+0 97 0 116 0 58 8 0 0 0 0 6 0 0 0 12 67 101 114 116
+105 102 105 99 97 116 101 58 7 0 0 0 14 83 109 116 112 83 101 114
+118 101 114 80 97 103 101 1 3 0 0 0 44 0 65 0 107 0 116 0
+105 0 118 0 101 0 114 0 32 0 84 0 76 0 83 0 32 0 107 0
+114 0 121 0 112 0 116 0 101 0 114 0 105 0 110 0 103 8 0 0
+0 0 6 0 0 0 21 69 110 97 98 108 101 32 84 76 83 32 101 110
+99 114 121 112 116 105 111 110 7 0 0 0 14 83 109 116 112 83 101 114
+118 101 114 80 97 103 101 1 3 0 0 0 12 0 85 0 110 0 110 0
+116 0 97 0 107 8 0 0 0 0 6 0 0 0 10 69 120 101 109 112
+116 105 111 110 115 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114
+80 97 103 101 1 3 0 0 0 22 0 73 0 80 0 32 0 97 0 100
+0 114 0 101 0 115 0 115 0 101 0 58 8 0 0 0 0 6 0 0
+0 11 73 80 32 97 100 100 114 101 115 115 58 7 0 0 0 14 83 109
+116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 42 0 73
+0 109 0 112 0 108 0 105 0 115 0 105 0 116 0 116 0 32 0 84
+0 76 0 83 0 32 0 40 0 115 0 109 0 116 0 112 0 115 0 41
+8 0 0 0 0 6 0 0 0 20 73 109 112 108 105 99 105 116 32 84
+76 83 32 40 115 109 116 112 115 41 7 0 0 0 14 83 109 116 112 83
+101 114 118 101 114 80 97 103 101 1 3 0 0 0 24 0 76 0 111 0
+107 0 97 0 108 0 32 0 115 0 101 0 114 0 118 0 101 0 114 8
+0 0 0 0 6 0 0 0 12 76 111 99 97 108 32 115 101 114 118 101
+114 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97 103 101
+1 3 0 0 0 10 0 78 0 97 0 118 0 110 0 58 8 0 0 0
+0 6 0 0 0 5 78 97 109 101 58 7 0 0 0 14 83 109 116 112
+83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 16 0 78 0 121
+0 32 0 107 0 111 0 110 0 116 0 111 8 0 0 0 0 6 0 0
+0 11 78 101 119 32 65 99 99 111 117 110 116 7 0 0 0 14 83 109
+116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 16 0 80
+0 97 0 115 0 115 0 111 0 114 0 100 0 58 8 0 0 0 0 6
+0 0 0 9 80 97 115 115 119 111 114 100 58 7 0 0 0 14 83 109
+116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0 0 10 0 80
+0 111 0 114 0 116 0 58 8 0 0 0 0 6 0 0 0 5 80 111
+114 116 58 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97
+103 101 1 3 0 0 0 36 0 75 0 114 0 101 0 118 0 32 0 97
+0 117 0 116 0 101 0 110 0 116 0 105 0 115 0 101 0 114 0 105
+0 110 0 103 8 0 0 0 0 6 0 0 0 22 82 101 113 117 105 114
+101 32 97 117 116 104 101 110 116 105 99 97 116 105 111 110 7 0 0 0
+14 83 109 116 112 83 101 114 118 101 114 80 97 103 101 1 3 0 0 0
+22 0 83 0 77 0 84 0 80 0 32 0 115 0 101 0 114 0 118 0
+101 0 114 8 0 0 0 0 6 0 0 0 11 83 77 84 80 32 115 101
+114 118 101 114 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80
+97 103 101 1 3 0 0 0 16 0 83 0 84 0 65 0 82 0 84 0
+84 0 76 0 83 8 0 0 0 0 6 0 0 0 8 83 84 65 82 84
+84 76 83 7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97
+103 101 1 3 0 0 0 28 0 84 0 76 0 83 0 32 0 107 0 114
+0 121 0 112 0 116 0 101 0 114 0 105 0 110 0 103 8 0 0 0
+0 6 0 0 0 14 84 76 83 32 101 110 99 114 121 112 116 105 111 110
+7 0 0 0 14 83 109 116 112 83 101 114 118 101 114 80 97 103 101 1
+3 0 0 0 38 0 102 0 101 0 107 0 115 0 46 0 32 0 49 0
+57 0 50 0 46 0 49 0 54 0 56 0 46 0 48 0 46 0 48 0
+47 0 56 8 0 0 0 0 6 0 0 0 17 101 103 46 32 49 57 50
+46 49 54 56 46 48 46 48 47 56 7 0 0 0 14 83 109 116 112 83
+101 114 118 101 114 80 97 103 101 1 3 0 0 0 48 0 76 0 101 0
+103 0 103 0 32 0 116 0 105 0 108 0 32 0 112 0 -27 0 32 0
+115 0 107 0 114 0 105 0 118 0 101 0 98 0 111 0 114 0 100 0
+101 0 116 8 0 0 0 0 6 0 0 0 14 65 100 100 32 116 111 32
+100 101 115 107 116 111 112 7 0 0 0 11 83 116 97 114 116 117 112 80
+97 103 101 1 3 0 0 0 42 0 76 0 101 0 103 0 103 0 32 0
+116 0 105 0 108 0 32 0 112 0 -27 0 32 0 115 0 116 0 97 0
+114 0 116 0 109 0 101 0 110 0 121 8 0 0 0 0 6 0 0 0
+17 65 100 100 32 116 111 32 115 116 97 114 116 32 109 101 110 117 7 0
+0 0 11 83 116 97 114 116 117 112 80 97 103 101 1 3 0 0 0 30
+0 86 0 101 0 100 0 32 0 115 0 121 0 115 0 116 0 101 0 109
+0 115 0 116 0 97 0 114 0 116 8 0 0 0 0 6 0 0 0 17
+65 116 32 115 121 115 116 101 109 32 115 116 97 114 116 117 112 7 0 0
+0 11 83 116 97 114 116 117 112 80 97 103 101 1 3 0 0 0 20 0
+65 0 117 0 116 0 111 0 109 0 97 0 116 0 105 0 115 0 107 8
+0 0 0 0 6 0 0 0 9 65 117 116 111 109 97 116 105 99 7 0
+0 0 11 83 116 97 114 116 117 112 80 97 103 101 1 3 0 0 0 14
+0 77 0 97 0 110 0 117 0 101 0 108 0 116 8 0 0 0 0 6
+0 0 0 6 77 97 110 117 97 108 7 0 0 0 11 83 116 97 114 116
+117 112 80 97 103 101 1 3 0 0 0 30 0 83 0 101 0 114 0 118
+0 101 0 114 0 32 0 111 0 112 0 112 0 115 0 116 0 97 0 114
+0 116 8 0 0 0 0 6 0 0 0 14 83 101 114 118 101 114 32 115
+116 97 114 116 117 112 7 0 0 0 11 83 116 97 114 116 117 112 80 97
+103 101 1 3 0 0 0 34 0 78 0 -27 0 114 0 32 0 100 0 117
+0 32 0 108 0 111 0 103 0 103 0 101 0 114 0 32 0 105 0 110
+0 110 8 0 0 0 0 6 0 0 0 15 87 104 101 110 32 108 111 103
+103 105 110 103 32 105 110 7 0 0 0 11 83 116 97 114 116 117 112 80
+97 103 101 1 3 0 0 0 22 0 69 0 45 0 77 0 97 0 105 0
+108 0 82 0 101 0 108 0 97 0 121 8 0 0 0 0 6 0 0 0
+11 69 45 77 97 105 108 82 101 108 97 121 7 0 0 0 9 84 105 116
+108 101 80 97 103 101 1 3 0 0 0 34 0 105 0 110 0 103 0 101
+0 110 0 116 0 105 0 110 0 103 0 32 0 -27 0 32 0 103 0 106
+0 -8 0 114 0 101 8 0 0 0 0 6 0 0 0 13 110 111 116 104
+105 110 103 32 116 111 32 100 111 7 0 0 0 14 85 112 100 97 116 101
+66 111 111 116 76 105 110 107 1 3 0 0 0 36 0 105 0 110 0 103
+0 101 0 110 0 116 0 105 0 110 0 103 0 32 0 -27 0 32 0 102
+0 106 0 101 0 114 0 110 0 101 8 0 0 0 0 6 0 0 0 17
+110 111 116 104 105 110 103 32 116 111 32 114 101 109 111 118 101 7 0 0
+0 14 85 112 100 97 116 101 66 111 111 116 76 105 110 107 1 3 0 0
+0 14 0 102 0 106 0 101 0 114 0 110 0 101 0 116 8 0 0 0
+0 6 0 0 0 7 114 101 109 111 118 101 100 7 0 0 0 14 85 112
+100 97 116 101 66 111 111 116 76 105 110 107 1 3 0 0 0 58 0 111
+0 112 0 112 0 100 0 97 0 116 0 101 0 114 0 101 0 114 0 32
+0 98 0 111 0 111 0 116 0 32 0 107 0 111 0 110 0 102 0 105
+0 103 0 117 0 114 0 97 0 115 0 106 0 111 0 110 8 0 0 0
+0 6 0 0 0 27 117 112 100 97 116 105 110 103 32 98 111 111 116 32
+99 111 110 102 105 103 117 114 97 116 105 111 110 7 0 0 0 14 85 112
+100 97 116 101 66 111 111 116 76 105 110 107 1 3 0 0 0 34 0 105
+0 110 0 103 0 101 0 110 0 116 0 105 0 110 0 103 0 32 0 -27
+0 -88 0 103 0 106 0 -8 0 114 0 101 8 0 0 0 0 6 0 0
+0 13 110 111 116 104 105 110 103 32 116 111 32 100 111 7 0 0 0 10
+85 112 100 97 116 101 76 105 110 107 1 3 0 0 0 14 0 102 0 106
+0 101 0 114 0 110 0 101 0 116 8 0 0 0 0 6 0 0 0 7
+114 101 109 111 118 101 100 7 0 0 0 10 85 112 100 97 116 101 76 105
+110 107 1 3 0 0 0 50 0 111 0 112 0 112 0 100 0 97 0 116
+0 101 0 114 0 101 0 114 0 32 0 97 0 117 0 116 0 111 0 115
+0 116 0 97 0 114 0 116 0 32 0 108 0 105 0 110 0 107 8 0
+0 0 0 6 0 0 0 23 117 112 100 97 116 105 110 103 32 97 117 116
+111 115 116 97 114 116 32 108 105 110 107 7 0 0 0 10 85 112 100 97
+116 101 76 105 110 107 1 3 0 0 0 52 0 111 0 112 0 112 0 100
+0 97 0 116 0 101 0 114 0 101 0 114 0 32 0 115 0 107 0 114
+0 105 0 118 0 101 0 98 0 111 0 114 0 100 0 32 0 108 0 105
+0 110 0 107 8 0 0 0 0 6 0 0 0 21 117 112 100 97 116 105
+110 103 32 100 101 115 116 107 111 112 32 108 105 110 107 7 0 0 0 10
+85 112 100 97 116 101 76 105 110 107 1 3 0 0 0 30 0 111 0 112
+0 112 0 100 0 97 0 116 0 101 0 114 0 101 0 114 0 32 0 108
+0 105 0 110 0 107 8 0 0 0 0 6 0 0 0 13 117 112 100 97
+116 105 110 103 32 108 105 110 107 7 0 0 0 10 85 112 100 97 116 101
+76 105 110 107 1 3 0 0 0 56 0 111 0 112 0 112 0 100 0 97
+0 116 0 101 0 114 0 101 0 114 0 32 0 112 0 114 0 111 0 103
+0 114 0 97 0 109 0 102 0 105 0 108 0 101 0 114 0 32 0 108
+0 105 0 110 0 107 8 0 0 0 0 6 0 0 0 27 117 112 100 97
+116 105 110 103 32 112 114 111 103 114 97 109 45 102 105 108 101 115 32 108
+105 110 107 7 0 0 0 10 85 112 100 97 116 101 76 105 110 107 1 3
+0 0 0 50 0 111 0 112 0 112 0 100 0 97 0 116 0 101 0 114
+0 101 0 114 0 32 0 115 0 116 0 97 0 114 0 116 0 109 0 101
+0 110 0 121 0 32 0 108 0 105 0 110 0 107 8 0 0 0 0 6
+0 0 0 24 117 112 100 97 116 105 110 103 32 115 116 97 114 116 32 109
+101 110 117 32 108 105 110 107 7 0 0 0 10 85 112 100 97 116 101 76
+105 110 107 1 -120 0 0 0 2 1 1
diff --git a/src/gui/emailrelay_tr.no_NO.ts b/src/gui/emailrelay_tr.no_NO.ts
new file mode 100644
index 0000000..3532d0f
--- /dev/null
+++ b/src/gui/emailrelay_tr.no_NO.ts
@@ -0,0 +1,1298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nb_NO">
+<context>
+    <name>CopyPayloadFile</name>
+    <message>
+        <location filename="installer.cpp" line="597"/>
+        <source>copying payload file</source>
+        <translation>kopierer payload fil</translation>
+    </message>
+</context>
+<context>
+    <name>CopyPayloadTree</name>
+    <message>
+        <location filename="installer.cpp" line="649"/>
+        <source>copying payload directory</source>
+        <translation>kopierer payload mappe</translation>
+    </message>
+</context>
+<context>
+    <name>CreateBatchFile</name>
+    <message>
+        <location filename="installer.cpp" line="900"/>
+        <source>creating startup batch file</source>
+        <translation>oppretter oppstart batch fil</translation>
+    </message>
+</context>
+<context>
+    <name>CreateConfigFile</name>
+    <message>
+        <location filename="installer.cpp" line="1139"/>
+        <source>exists</source>
+        <translation>eksisterer</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1148"/>
+        <source>creating configuration file</source>
+        <translation>oppretter konfigurasjonsfil</translation>
+    </message>
+</context>
+<context>
+    <name>CreateDirectory</name>
+    <message>
+        <location filename="installer.cpp" line="468"/>
+        <source>creating %1 directory</source>
+        <translation>oppretter %1 mappe</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="485"/>
+        <source>nothing to do</source>
+        <translation>ingenting å¨gjøre</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="493"/>
+        <source>directory path exists but not valid a directory</source>
+        <translation>mappesti eksisterer men er ikke en gyldig mappe</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="494"/>
+        <source>exists</source>
+        <translation>eksisterer</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="502"/>
+        <source>directory exists but is not writable</source>
+        <translation>mappe eksisterer men er ikke skrivbar</translation>
+    </message>
+</context>
+<context>
+    <name>CreateFilterScript</name>
+    <message>
+        <location filename="installer.cpp" line="1088"/>
+        <source>nothing to do</source>
+        <translation>ingenting å gjøre</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1092"/>
+        <source>exists</source>
+        <translation>eksisterer</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1103"/>
+        <source>cannot write to file</source>
+        <translation>kan ikke skrive til fil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1113"/>
+        <source>creating an empty client filter script</source>
+        <translation>oppretter et tomt klient filter skript</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1115"/>
+        <source>creating an empty filter script</source>
+        <translation>oppretter et tomt filter skript</translation>
+    </message>
+</context>
+<context>
+    <name>CreatePointerFile</name>
+    <message>
+        <location filename="installer.cpp" line="544"/>
+        <source>cannot write to file</source>
+        <translation>kan ikke skrive til fil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="557"/>
+        <source>creating pointer file</source>
+        <translation>oppretter pekerfil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="568"/>
+        <source>nothing to do</source>
+        <translation>ingenting å gjøre</translation>
+    </message>
+</context>
+<context>
+    <name>CreateSecrets</name>
+    <message>
+        <location filename="installer.cpp" line="753"/>
+        <source>creating authentication secrets file</source>
+        <translation>oppretter autentisering hemmelig fil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="886"/>
+        <source>cannot create file</source>
+        <translation>kan ikke opprette fil</translation>
+    </message>
+</context>
+<context>
+    <name>DirectoryPage</name>
+    <message>
+        <location filename="pages.cpp" line="154"/>
+        <location filename="pages.cpp" line="172"/>
+        <location filename="pages.cpp" line="190"/>
+        <location filename="pages.cpp" line="207"/>
+        <source>Directory:</source>
+        <extracomment>install directory, text-edit label
+----------
+spool directory, text-edit label
+----------
+run-time directory, text-edit label</extracomment>
+        <translation>Mappe:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="158"/>
+        <location filename="pages.cpp" line="177"/>
+        <location filename="pages.cpp" line="194"/>
+        <location filename="pages.cpp" line="212"/>
+        <source>Browse</source>
+        <extracomment>activate a file-open dialog box to select a directory</extracomment>
+        <translation>Utforsk</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="166"/>
+        <source>Installation directory</source>
+        <extracomment>install directory, group label</extracomment>
+        <translation>Installasjonsmappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="174"/>
+        <source>--spool-dir</source>
+        <translation>--spool-mappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="185"/>
+        <source>Spool directory</source>
+        <extracomment>spool directory, group label</extracomment>
+        <translation>Spool mappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="201"/>
+        <source>Configuration directory</source>
+        <translation>Konfigurasjonsmappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="209"/>
+        <source>--pid-file, --log-file</source>
+        <translation>--pid-fil, --loggfil</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="220"/>
+        <source>Run-time directory</source>
+        <extracomment>run-time directory, group label</extracomment>
+        <translation>Run-time mappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="241"/>
+        <source>Directories</source>
+        <extracomment>page title of directories page</extracomment>
+        <translation>Mapper</translation>
+    </message>
+</context>
+<context>
+    <name>DoWhatPage</name>
+    <message>
+        <location filename="pages.cpp" line="438"/>
+        <source>POP3 server</source>
+        <translation>POP3 server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="439"/>
+        <source>SMTP server</source>
+        <translation>SMTP server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="449"/>
+        <source>Server</source>
+        <extracomment>group label for pop3/smtp check boxes</extracomment>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="453"/>
+        <source>Synchronously</source>
+        <extracomment>forwarding checkbox: forward emails as they are received</extracomment>
+        <translation>Synkronisert</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="454"/>
+        <source>--immediate</source>
+        <translation>--umiddelbart</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="456"/>
+        <source>When client disconnects</source>
+        <extracomment>forwarding checkbox: forward emails when the client disconnects</extracomment>
+        <translation>Når klient frakobler</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="457"/>
+        <source>--forward-on-disconnect</source>
+        <translation>--videresend ved frakobling</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="459"/>
+        <source>Check periodically</source>
+        <extracomment>forwarding checkbox: forward emails from time to time</extracomment>
+        <translation>Sjekk periodisk</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="460"/>
+        <source>--poll</source>
+        <translation>--poll</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="462"/>
+        <source>Only on demand</source>
+        <extracomment>forwarding checkbox: forward emails when requested via the admin interface</extracomment>
+        <translation>Kun på forespørsel</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="463"/>
+        <source>--admin</source>
+        <translation>--admin</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="475"/>
+        <source>every</source>
+        <extracomment>periodic forwarding: &apos;check periodically&apos; (above) &apos;every&apos; &apos;second/minute/hour&apos; (below)</extracomment>
+        <translation>hver</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="477"/>
+        <source>second</source>
+        <translation>sekund</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="478"/>
+        <source>minute</source>
+        <translation>minutt</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="479"/>
+        <source>hour</source>
+        <translation>time</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="501"/>
+        <source>Mail forwarding</source>
+        <translation>Videresending av post</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="506"/>
+        <source>Installation type</source>
+        <extracomment>page title of install-type page</extracomment>
+        <translation>Installasjonstype</translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigFile</name>
+    <message>
+        <location filename="installer.cpp" line="1179"/>
+        <source>editing configuration file</source>
+        <translation>rediger konfigurasjonsfil</translation>
+    </message>
+</context>
+<context>
+    <name>FileGroup</name>
+    <message>
+        <location filename="installer.cpp" line="679"/>
+        <source>setting group permissions</source>
+        <translation>setter gruppe rettigheter</translation>
+    </message>
+</context>
+<context>
+    <name>FilterPage</name>
+    <message>
+        <location filename="pages.cpp" line="992"/>
+        <location filename="pages.cpp" line="1021"/>
+        <source>Filter:</source>
+        <extracomment>label for an edit box that contains the filename of a server-side filter script
+----------
+label for an edit box that contains the filename of a client-side filter script</extracomment>
+        <translation>Filter:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="997"/>
+        <location filename="pages.cpp" line="1012"/>
+        <source>None</source>
+        <extracomment>server-side filtering options...
+----------
+client-side filtering options: none or script</extracomment>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="999"/>
+        <location filename="pages.cpp" line="1013"/>
+        <source>Script</source>
+        <extracomment>run the specified filter script</extracomment>
+        <translation>Skript</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1001"/>
+        <source>Spamd</source>
+        <extracomment>use the spamassassin &apos;spamd&apos; daemon</extracomment>
+        <translation>Spammet</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1003"/>
+        <source>Copy</source>
+        <extracomment>copy emails into directories for multiple pop clients</extracomment>
+        <translation>Kopier</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1014"/>
+        <source>--client-filter</source>
+        <translation>--klient filter</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1038"/>
+        <source>Server</source>
+        <extracomment>group label for server-side filtering options</extracomment>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1046"/>
+        <source>Client</source>
+        <extracomment>group label for client-side filtering options</extracomment>
+        <translation>Klient</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1051"/>
+        <source>Filters</source>
+        <extracomment>page title of filters page</extracomment>
+        <translation>Filtere</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1111"/>
+        <source>see pop server page</source>
+        <extracomment>the edit boxes are disabled because of what was selected on the pop-server page</extracomment>
+        <translation>se pop server side</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1123"/>
+        <location filename="pages.cpp" line="1124"/>
+        <location filename="pages.cpp" line="1125"/>
+        <source>--filter</source>
+        <translation>--filter</translation>
+    </message>
+</context>
+<context>
+    <name>GDialog</name>
+    <message>
+        <location filename="gdialog.cpp" line="41"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="gdialog.cpp" line="42"/>
+        <source>&amp;&lt; Back</source>
+        <translation>&amp;&lt; Tilbake</translation>
+    </message>
+    <message>
+        <location filename="gdialog.cpp" line="43"/>
+        <source>Next &amp;&gt;</source>
+        <translation>Neste &amp;&gt;</translation>
+    </message>
+    <message>
+        <location filename="gdialog.cpp" line="44"/>
+        <source>&amp;Finish</source>
+        <translation>&amp;Avslutt</translation>
+    </message>
+    <message>
+        <location filename="gdialog.cpp" line="184"/>
+        <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <location filename="gdialog.cpp" line="189"/>
+        <source>Launch</source>
+        <translation>Kjør</translation>
+    </message>
+</context>
+<context>
+    <name>GPage</name>
+    <message>
+        <location filename="gpage.cpp" line="202"/>
+        <source>Username to be added to the secrets file</source>
+        <extracomment>used as a tool-tip for edit boxes containing an authentication username</extracomment>
+        <translation>Brukernavn som skal legges til i hemmelig fil</translation>
+    </message>
+    <message>
+        <location filename="gpage.cpp" line="208"/>
+        <source>Password to be added to the secrets file</source>
+        <extracomment>used as a tool-tip for edit boxes containing an authentication password</extracomment>
+        <translation>Passord som skal legges til i hemmelig fil</translation>
+    </message>
+</context>
+<context>
+    <name>GenerateKey</name>
+    <message>
+        <location filename="installer.cpp" line="1224"/>
+        <source>generating tls server key</source>
+        <translation>genererer tls server key</translation>
+    </message>
+</context>
+<context>
+    <name>InstallService</name>
+    <message>
+        <location filename="installer.cpp" line="982"/>
+        <location filename="installer.cpp" line="991"/>
+        <source>nothing to do</source>
+        <translation>ingenting å gjøre</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="991"/>
+        <source>uninstalled</source>
+        <translation>avinstallert</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="997"/>
+        <source>installing service</source>
+        <translation>installerer service</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="997"/>
+        <source>uninstalling service</source>
+        <translation>avinstallerer service</translation>
+    </message>
+</context>
+<context>
+    <name>Installer</name>
+    <message>
+        <location filename="installer.cpp" line="1341"/>
+        <source>ok</source>
+        <translation>ok</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1800"/>
+        <source>** failed **</source>
+        <translation>** mislyktes **</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1806"/>
+        <source>== finished ==</source>
+        <translation>== ferdig ==</translation>
+    </message>
+</context>
+<context>
+    <name>InstallerImp</name>
+    <message>
+        <location filename="installer.cpp" line="1511"/>
+        <source>install</source>
+        <translation>installer</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1512"/>
+        <source>configuration</source>
+        <translation>konfigurasjon</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1514"/>
+        <source>runtime</source>
+        <translation>kjøretid</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1515"/>
+        <source>spool</source>
+        <translation>spool</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1529"/>
+        <source>pop-by-name</source>
+        <translation>pop etter navn</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1601"/>
+        <source>filter</source>
+        <translation>filter</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1607"/>
+        <source>client-filter</source>
+        <translation>klient filter</translation>
+    </message>
+</context>
+<context>
+    <name>JustTesting</name>
+    <message>
+        <location filename="installer.cpp" line="1311"/>
+        <source>doing something</source>
+        <extracomment>random text used in testing</extracomment>
+        <translation>gjør noe</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1326"/>
+        <source>nothing to do</source>
+        <translation>ingenting å gjøre</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1329"/>
+        <source>some error</source>
+        <translation>noen feil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1332"/>
+        <source>another error</source>
+        <translation>en annen feil</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <location filename="installer.cpp" line="1241"/>
+        <source>starting service</source>
+        <translation>starter service</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1246"/>
+        <source>running startup batch file</source>
+        <translation>kjører oppstart batch fil</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1248"/>
+        <source>done</source>
+        <translation>ferdig</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1253"/>
+        <source>running</source>
+        <translation>kjører</translation>
+    </message>
+</context>
+<context>
+    <name>LicensePage</name>
+    <message>
+        <location filename="pages.cpp" line="107"/>
+        <source>I agree to the terms and conditions of the license</source>
+        <translation>Jeg godtar vilkårene og betingelsene for lisensen</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="115"/>
+        <source>License</source>
+        <extracomment>page title of license page</extracomment>
+        <translation>Lisens</translation>
+    </message>
+</context>
+<context>
+    <name>ListeningPage</name>
+    <message>
+        <location filename="pages.cpp" line="1552"/>
+        <source>Any address</source>
+        <extracomment>server listening-address options...</extracomment>
+        <translation>Hvilken adresse som helst</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1554"/>
+        <source>Any IPv&amp;4</source>
+        <extracomment>listen on any ipv4 address</extracomment>
+        <translation>Hvilken som helst IPv&amp;4</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1556"/>
+        <source>Any IPv&amp;6</source>
+        <extracomment>listen on any ipv6 address</extracomment>
+        <translation>Hvilken som helst IPv&amp;6</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1558"/>
+        <source>Localhost</source>
+        <extracomment>listen on the ipv4 and ipv6 &apos;localhost&apos; addresses</extracomment>
+        <translation>Localhost</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1560"/>
+        <source>List</source>
+        <extracomment>listen on specific addresses given in the edit-box</extracomment>
+        <translation>Lytt</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1563"/>
+        <source>--interface</source>
+        <translation>--grensesnitt</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1606"/>
+        <source>Listen on</source>
+        <extracomment>group label for the network address that the server should listen on</extracomment>
+        <translation>Lytt på</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1611"/>
+        <source>Allow remote clients</source>
+        <translation>Tillat eksterne klienter</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1612"/>
+        <source>--remote-clients</source>
+        <translation>--eksterne klienter</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1619"/>
+        <source>Clients</source>
+        <extracomment>group label for allow-remote-clients checkbox</extracomment>
+        <translation>Klienter</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1626"/>
+        <source>Connections</source>
+        <extracomment>page title of connections page</extracomment>
+        <translation>Tilkoblinger</translation>
+    </message>
+</context>
+<context>
+    <name>LoggingPage</name>
+    <message>
+        <location filename="pages.cpp" line="1398"/>
+        <source>Debug messages</source>
+        <extracomment>enable debug-level logging</extracomment>
+        <translation>Feilsøk meldinger</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1399"/>
+        <source>--debug</source>
+        <translation>--debug</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1401"/>
+        <source>Verbose logging</source>
+        <extracomment>enable more verbose logging</extracomment>
+        <translation>Detaljert logging</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1402"/>
+        <source>--verbose</source>
+        <translation>--detaljert</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1404"/>
+        <source>Write to the system log</source>
+        <translation>skriv til system logg</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1405"/>
+        <source>--syslog</source>
+        <translation>--syslog</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1407"/>
+        <source>Write to log file</source>
+        <translation>skriv til loggfil</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1409"/>
+        <source>--log-file</source>
+        <translation>--loggfil</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1411"/>
+        <source>Log file:</source>
+        <translation>Loggfil:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1414"/>
+        <source>Browse</source>
+        <translation>Utforsk</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1417"/>
+        <source>Timestamps</source>
+        <translation>Timestamps</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1418"/>
+        <source>--log-time</source>
+        <translation>--loggtid</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1420"/>
+        <source>Network addresses</source>
+        <translation>Netverksadresse</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1421"/>
+        <source>--log-address</source>
+        <translation>--loggadresse</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1454"/>
+        <source>Level</source>
+        <extracomment>group label for the logging verbosity level</extracomment>
+        <translation>Level</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1458"/>
+        <source>Output</source>
+        <extracomment>group label for the logging output selection</extracomment>
+        <translation>Output</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1462"/>
+        <source>Extra information</source>
+        <extracomment>group label for the selection of additional logging information fields</extracomment>
+        <translation>Ekstra informasjon</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1469"/>
+        <source>Logging</source>
+        <extracomment>page title of logging page</extracomment>
+        <translation>Logging</translation>
+    </message>
+</context>
+<context>
+    <name>PopPage</name>
+    <message>
+        <location filename="pages.cpp" line="571"/>
+        <source>Port:</source>
+        <extracomment>internet address, port number</extracomment>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="573"/>
+        <source>--pop-port</source>
+        <translation>--pop port</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="581"/>
+        <source>Local server</source>
+        <extracomment>group label for port number edit box</extracomment>
+        <translation>Lokal server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="585"/>
+        <source>One client</source>
+        <extracomment>how pop clients will access spooled emails...</extracomment>
+        <translation>En klient</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="586"/>
+        <source>Many clients sharing a spool directory</source>
+        <translation>Mange klienter deler en spool mappe</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="587"/>
+        <source>Many clients with separate spool directories</source>
+        <translation>Mange klienter med separate spool mapper</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="588"/>
+        <source>--pop-by-name</source>
+        <translation>--pop etter navn</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="590"/>
+        <source>Disable message deletion</source>
+        <translation>Deaktiver melding sletting</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="591"/>
+        <source>--pop-no-delete</source>
+        <translation>--pop ikke slett</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="593"/>
+        <source>Copy SMTP messages to all</source>
+        <extracomment>copy incoming email messages to all pop clients</extracomment>
+        <translation>kopier SMTP meldinger til alle</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="594"/>
+        <source>--filter=emailrelay-filter-copy</source>
+        <translation>--filter=emailrelay-filter-kopi</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="622"/>
+        <source>Client accounts</source>
+        <extracomment>group label for username/password edit-box pairs</extracomment>
+        <translation>Klient kontoer</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="627"/>
+        <source>Name:</source>
+        <extracomment>pop account, username</extracomment>
+        <translation>Navn:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="629"/>
+        <source>Password:</source>
+        <extracomment>pop account, password</extracomment>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="663"/>
+        <source>New Accounts</source>
+        <extracomment>group label for username/password edit boxes when installing</extracomment>
+        <translation>Nye kontoer</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="665"/>
+        <source>Accounts</source>
+        <extracomment>group label for username/password edit boxes when reconfiguring</extracomment>
+        <translation>Kontoer</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="670"/>
+        <source>POP server</source>
+        <extracomment>page title of pop-server page</extracomment>
+        <translation>POP server</translation>
+    </message>
+</context>
+<context>
+    <name>ProgressPage</name>
+    <message>
+        <location filename="pages.cpp" line="1862"/>
+        <source>Installing</source>
+        <extracomment>page title of installation progress page</extracomment>
+        <translation>Installerer</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2005"/>
+        <source>%1... </source>
+        <comment>1</comment>
+        <translation>%1... </translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2008"/>
+        <source>%1 [%2]... </source>
+        <comment>2</comment>
+        <extracomment>installer progress item, untranslated subject, not yet run</extracomment>
+        <translation>%1 [%2]... </translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2014"/>
+        <source>%1... %2</source>
+        <comment>3</comment>
+        <translation>%1... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2017"/>
+        <source>%1 [%3]... %2</source>
+        <comment>4</comment>
+        <extracomment>installer progress item, untranslated subject, with non-error result</extracomment>
+        <translation>%1 [%3]... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2023"/>
+        <source>%1... %2</source>
+        <comment>5</comment>
+        <translation>%1... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2026"/>
+        <source>%1 [%3]... %2</source>
+        <comment>6</comment>
+        <extracomment>installer progress item, untranslated subject, with translated error result</extracomment>
+        <translation>%1 [%3]... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2032"/>
+        <source>%1... %2</source>
+        <comment>7</comment>
+        <translation>%1... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2035"/>
+        <source>%1 [%3]... %2</source>
+        <comment>8</comment>
+        <extracomment>installer progress item, untranslated subject, with native error result</extracomment>
+        <translation>%1 [%3]... %2</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2041"/>
+        <source>%1... %2: %3</source>
+        <comment>9</comment>
+        <translation>%1... %2: %3</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="2044"/>
+        <source>%1 [%3]... %2: %4</source>
+        <comment>10</comment>
+        <extracomment>installer progress item, untranslated subject, with translated error result and untranslated error subject</extracomment>
+        <translation>%1 [%3]... %2: %4</translation>
+    </message>
+</context>
+<context>
+    <name>ReadyPage</name>
+    <message>
+        <location filename="pages.cpp" line="1784"/>
+        <source>Ready to install</source>
+        <translation>Klar til installering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1786"/>
+        <source>Ready to configure</source>
+        <translation>Klar til konfigurering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1798"/>
+        <source>E-MailRelay will now be installed.</source>
+        <translation>E-MailRelay vil nå bli installert.</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1799"/>
+        <source>E-MailRelay will now be configured.</source>
+        <translation>E-MailRelay vil nå bli konfigurert.</translation>
+    </message>
+</context>
+<context>
+    <name>RegisterAsEventSource</name>
+    <message>
+        <location filename="installer.cpp" line="1068"/>
+        <source>registering as a source for event viewer logging</source>
+        <translation>registreres som en kilde for logging i event viewer</translation>
+    </message>
+</context>
+<context>
+    <name>SmtpClientPage</name>
+    <message>
+        <location filename="pages.cpp" line="1229"/>
+        <source>Hostname:</source>
+        <extracomment>internet address, hostname of remote smtp server</extracomment>
+        <translation>Hostnavn:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1233"/>
+        <source>--forward-to</source>
+        <translation>--videresend til</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1242"/>
+        <source>Port:</source>
+        <extracomment>internet address, port number of remote smtp server</extracomment>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1253"/>
+        <source>Remote server</source>
+        <translation>Ekstern server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1256"/>
+        <source>Use TLS encryption</source>
+        <translation>Bruk TLS kryptering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1257"/>
+        <source>--client-tls, --client-tls-connection</source>
+        <translation>--klient-tls, --klient-tls-tilkobling</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1262"/>
+        <source>STARTTLS</source>
+        <extracomment>not translatable, see RFC-2487</extracomment>
+        <translation>STARTTLS</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1264"/>
+        <source>--client-tls</source>
+        <translation>--klient tls</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1266"/>
+        <source>Implicit TLS (smtps)</source>
+        <extracomment>&apos;implicit&apos; because encryption is assumed to be always active, see RFC-8314 3.</extracomment>
+        <translation>Implisitt TLS (smtps)</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1268"/>
+        <source>--client-tls-connection</source>
+        <translation>--klient-tls-tilkobling</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1275"/>
+        <source>TLS encryption</source>
+        <translation>TLS kryptering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1279"/>
+        <source>Supply authentication</source>
+        <extracomment>client should supply authentication credentials when connecting to the server</extracomment>
+        <translation>Tilfør autentisering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1281"/>
+        <source>--client-auth</source>
+        <translation>--klient-auth</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1286"/>
+        <source>Authentication</source>
+        <translation>Autentisering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1290"/>
+        <source>Name:</source>
+        <extracomment>smtp client account, username</extracomment>
+        <translation>Navn:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1296"/>
+        <source>Password:</source>
+        <extracomment>smtp client account, password</extracomment>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1318"/>
+        <source>New Account</source>
+        <extracomment>group label for username/password edit box when installing</extracomment>
+        <translation>Ny konto</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1320"/>
+        <source>Account</source>
+        <extracomment>group label for username/password edit box when reconfiguring</extracomment>
+        <translation>Konto</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1325"/>
+        <source>SMTP client</source>
+        <extracomment>page title of smtp-client page</extracomment>
+        <translation>SMTP klient</translation>
+    </message>
+</context>
+<context>
+    <name>SmtpServerPage</name>
+    <message>
+        <location filename="pages.cpp" line="759"/>
+        <source>Port:</source>
+        <extracomment>internet address, port number</extracomment>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="761"/>
+        <source>--port</source>
+        <translation>--port</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="769"/>
+        <source>Local server</source>
+        <extracomment>group label for port number edit box</extracomment>
+        <translation>Lokal server</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="775"/>
+        <source>Require authentication</source>
+        <extracomment>smtp server requires authentication</extracomment>
+        <translation>Krev autentisering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="776"/>
+        <source>--server-auth</source>
+        <translation>--server-auth</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="783"/>
+        <source>Authentication</source>
+        <extracomment>group label for &apos;require authentication&apos; check box</extracomment>
+        <translation>Autentisering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="789"/>
+        <source>Name:</source>
+        <extracomment>smtp server account, username</extracomment>
+        <translation>Navn:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="795"/>
+        <source>Password:</source>
+        <extracomment>smtp server account, password</extracomment>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="817"/>
+        <source>New Account</source>
+        <extracomment>group label for username/password edit box when installing</extracomment>
+        <translation>Ny konto</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="819"/>
+        <source>Account</source>
+        <extracomment>group label for username/password edit box when reconfiguring</extracomment>
+        <translation>Konto</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="827"/>
+        <source>IP address:</source>
+        <translation>IP adresse:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="830"/>
+        <source>eg. 192.168.0.0/8</source>
+        <translation>feks. 192.168.0.0/8</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="831"/>
+        <source>Exemptions</source>
+        <translation>Unntak</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="846"/>
+        <source>TLS encryption</source>
+        <extracomment>group box label for encryption options</extracomment>
+        <translation>TLS kryptering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="848"/>
+        <source>Enable TLS encryption</source>
+        <translation>Aktiver TLS kryptering</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="849"/>
+        <source>--server-tls, --server-tls-connection</source>
+        <translation>--server-tls, --server-tls-tilkobling</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="851"/>
+        <source>STARTTLS</source>
+        <extracomment>not translatable, see RFC-2487</extracomment>
+        <translation>STARTTLS</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="852"/>
+        <source>--server-tls</source>
+        <translation>--server-tls</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="854"/>
+        <source>Implicit TLS (smtps)</source>
+        <extracomment>&apos;implicit&apos; because encryption is assumed to be always active, see RFC-8314 3.</extracomment>
+        <translation>Implisitt TLS (smtps)</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="855"/>
+        <source>--server-tls-connection</source>
+        <translation>--server-tls-tilkobling</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="862"/>
+        <source>Certificate:</source>
+        <extracomment>X.509 certificate</extracomment>
+        <translation>Sertifikat:</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="864"/>
+        <source>--server-tls-certificate</source>
+        <translation>--server-tls-sertifikat</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="867"/>
+        <source>Browse</source>
+        <extracomment>activate a file-open dialog box to select a file</extracomment>
+        <translation>Utforsk</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="888"/>
+        <source>SMTP server</source>
+        <extracomment>page title of smtp-server page</extracomment>
+        <translation>SMTP server</translation>
+    </message>
+</context>
+<context>
+    <name>StartupPage</name>
+    <message>
+        <location filename="pages.cpp" line="1706"/>
+        <source>At system startup</source>
+        <translation>Ved systemstart</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1707"/>
+        <source>When logging in</source>
+        <translation>Når du logger inn</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1712"/>
+        <source>Add to start menu</source>
+        <translation>Legg til på startmeny</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1713"/>
+        <source>Add to desktop</source>
+        <translation>Legg til på skrivebordet</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1732"/>
+        <source>Automatic</source>
+        <translation>Automatisk</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1735"/>
+        <source>Manual</source>
+        <translation>Manuelt</translation>
+    </message>
+    <message>
+        <location filename="pages.cpp" line="1740"/>
+        <source>Server startup</source>
+        <extracomment>page title of server-startup page</extracomment>
+        <translation>Server oppstart</translation>
+    </message>
+</context>
+<context>
+    <name>TitlePage</name>
+    <message>
+        <location filename="pages.cpp" line="77"/>
+        <source>E-MailRelay</source>
+        <extracomment>page title of opening page</extracomment>
+        <translation>E-MailRelay</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateBootLink</name>
+    <message>
+        <location filename="installer.cpp" line="1023"/>
+        <source>updating boot configuration</source>
+        <translation>oppdaterer boot konfigurasjon</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1035"/>
+        <source>nothing to do</source>
+        <translation>ingenting å gjøre</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1044"/>
+        <source>removed</source>
+        <translation>fjernet</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="1044"/>
+        <source>nothing to remove</source>
+        <translation>ingenting å fjerne</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateLink</name>
+    <message>
+        <location filename="installer.cpp" line="933"/>
+        <source>updating destkop link</source>
+        <translation>oppdaterer skrivebord link</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="934"/>
+        <source>updating start menu link</source>
+        <translation>oppdaterer startmeny link</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="935"/>
+        <source>updating autostart link</source>
+        <translation>oppdaterer autostart link</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="936"/>
+        <source>updating program-files link</source>
+        <translation>oppdaterer programfiler link</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="937"/>
+        <source>updating link</source>
+        <translation>oppdaterer link</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="960"/>
+        <source>removed</source>
+        <translation>fjernet</translation>
+    </message>
+    <message>
+        <location filename="installer.cpp" line="960"/>
+        <source>nothing to do</source>
+        <translation>ingenting å¨gjøre</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/gui/guimain.cpp b/src/gui/guimain.cpp
index 458608a..1382ea5 100644
--- a/src/gui/guimain.cpp
+++ b/src/gui/guimain.cpp
@@ -284,11 +284,14 @@ int main( int argc , char * argv [] )
 				G_LOG( "main: locale: " << GQt::stdstr(QLocale::system().name()) ) ; // eg. "en_GB"
 				bool loaded = false ;
 				G::Path qmfile = value( args , "--qm" ) ;
+				G::Path qmdir = value( args , "--qmdir" ) ;
+				if( qmdir.empty() )
+					qmdir = argv0.dirname() + "translations" ;
 				if( !qmfile.empty() )
 					loaded = translator.load( GQt::qstr(qmfile.str()) ) ;
 				if( !loaded )
 					loaded = translator.load( QLocale() , GQt::qstr("emailrelay") , GQt::qstr(".") ,
-						GQt::qstr((argv0.dirname()+"translations").str()) ) ;
+						GQt::qstr(qmdir.str()) , GQt::qstr(".qm") ) ;
 				if( loaded )
 					QCoreApplication::installTranslator( &translator ) ;
 				else
diff --git a/src/gui/installer.cpp b/src/gui/installer.cpp
index 970b8be..6e7032c 100644
--- a/src/gui/installer.cpp
+++ b/src/gui/installer.cpp
@@ -184,7 +184,8 @@ struct CreatePointerFile : public ActionBase
 	G::Path m_gui_exe ;
 	G::Path m_dir_config ;
 	G::Path m_dir_install ;
-	CreatePointerFile( const G::Path & pointer_file , const G::Path & gui_exe , const G::Path & dir_config , const G::Path & dir_install ) ;
+	G::Path m_dir_tr ;
+	CreatePointerFile( const G::Path & pointer_file , const G::Path & gui_exe , const G::Path & dir_config , const G::Path & dir_install , const G::Path & dir_tr ) ;
 	void run() override ;
 	trstring text() const override ;
 	std::string subject() const override ;
@@ -506,11 +507,12 @@ void CreateDirectory::run()
 // ==
 
 CreatePointerFile::CreatePointerFile( const G::Path & pointer_file , const G::Path & gui_exe ,
-	const G::Path & dir_config , const G::Path & dir_install ) :
+	const G::Path & dir_config , const G::Path & dir_install , const G::Path & dir_tr ) :
 		m_pointer_file(pointer_file) ,
 		m_gui_exe(gui_exe) ,
 		m_dir_config(dir_config) ,
-		m_dir_install(dir_install)
+		m_dir_install(dir_install) ,
+		m_dir_tr(dir_tr)
 {
 }
 
@@ -532,7 +534,7 @@ void CreatePointerFile::run()
 	{
 		stream << "#!/bin/sh\n" ;
 		if( !m_gui_exe.empty() )
-			stream << "exec \"`dirname \\\"$0\\\"`/" << m_gui_exe.basename() << "\" \"$@\"\n" ;
+			stream << "exec \"`dirname \\\"$0\\\"`/" << m_gui_exe.basename() << "\" --qmdir=\"" << m_dir_tr << "\" \"$@\"\n" ;
 	}
 
 	// write the pointer variable(s)
@@ -1386,7 +1388,8 @@ InstallerImp::InstallerImp( bool installing , bool is_windows , bool is_mac , co
 	m_installer_config.add( "-exe" , isWindows() ? "%dir-install%/emailrelay.exe" :
 		( isMac() ? "%dir-install%/E-MailRelay.app/Contents/MacOS/emailrelay" : "%dir-install%/sbin/emailrelay" ) ) ;
 	m_installer_config.add( "-gui" , isWindows() ? "%dir-install%/emailrelay-gui.exe" : "%dir-install%/sbin/emailrelay-gui.real" ) ;
-	m_installer_config.add( "-icon" , isWindows()?"%dir-install%/emailrelay.exe":"%dir-install%/lib/emailrelay/emailrelay-icon.png");
+	m_installer_config.add( "-icon" , isWindows()?"%dir-install%/emailrelay.exe":"%dir-install%/share/emailrelay/emailrelay-icon.png") ;
+	m_installer_config.add( "-trdir" , isWindows()?"%dir-install%/translations":"%dir-install%/share/emailrelay") ;
 	m_installer_config.add( "-pointer" , isWindows() ? "%dir-install%/emailrelay-gui.cfg" : "%dir-install%/sbin/emailrelay-gui" ) ;
 	m_installer_config.add( "-startstop" , isWindows() ? "" : "%dir-install%/lib/emailrelay/emailrelay-startstop.sh" ) ;
 	m_installer_config.add( "-servicewrapper" , isWindows() ? "%dir-install%/emailrelay-service.exe" : "" ) ;
@@ -1581,7 +1584,8 @@ void InstallerImp::addActions()
 		G::Path gui_exe = ivalue( "-gui" ) ;
 		G::Path dir_config = pvalue( "dir-config" ) ;
 		G::Path dir_install = pvalue( "dir-install" ) ;
-		addAction( new CreatePointerFile(pointer_file,gui_exe,dir_config,dir_install) ) ;
+		G::Path dir_tr = ivalue( "-trdir" ) ;
+		addAction( new CreatePointerFile(pointer_file,gui_exe,dir_config,dir_install,dir_tr) ) ;
 	}
 
 	// register for using the windows event log - doing it here since the server
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index fc82356..f894fcb 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -142,8 +142,8 @@ if GCONFIG_WINDOWS
 	$(top_builddir)/src/win32/libextra.a \
 	$(top_builddir)/src/glib/libglib.a \
 	$(RESOURCES) \
-	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
-	-lgdi32 -lws2_32 -liphlpapi -ladvapi32 -lcomctl32
+	$(GCONFIG_TLS_LIBS) \
+	-lws2_32 -liphlpapi -lcomctl32
 else
  emailrelay_SOURCES = $(TEXTMODE_MAIN_SOURCES) $(OTHER_SOURCES)
  emailrelay_LDFLAGS =
@@ -155,7 +155,7 @@ else
 	$(top_builddir)/src/gnet/libgnet.a \
 	$(top_builddir)/src/gssl/libgssl.a \
 	$(top_builddir)/src/glib/libglib.a \
-	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END)
+	$(GCONFIG_TLS_LIBS)
 endif
 
 if GCONFIG_WINDOWS
@@ -170,7 +170,7 @@ if GCONFIG_WINDOWS
 	$(top_builddir)/src/gssl/libgssl.a \
 	$(top_builddir)/src/win32/libextra.a \
 	$(top_builddir)/src/glib/libglib.a \
-	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
+	$(GCONFIG_TLS_LIBS) \
 	-lws2_32 -liphlpapi -lcomctl32
 endif
 
@@ -180,14 +180,14 @@ if GCONFIG_WINDOWS
  emailrelay_passwd_LDADD = \
 	$(top_builddir)/src/gssl/libgssl.a \
 	$(top_builddir)/src/glib/libglib.a \
-	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
+	$(GCONFIG_TLS_LIBS) \
 	-lws2_32 -liphlpapi -lcomctl32
 else
  emailrelay_passwd_LDFLAGS =
  emailrelay_passwd_LDADD =  \
 	$(top_builddir)/src/gssl/libgssl.a \
 	$(top_builddir)/src/glib/libglib.a \
-	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END)
+	$(GCONFIG_TLS_LIBS)
 endif
 
 emailrelay_submit_SOURCES = submit.cpp legal.cpp legal.h
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index a273068..6832e52 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -105,9 +105,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(e_libexecdir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(e_spooldir)"
+@GCONFIG_MAC_TRUE@am__EXEEXT_1 = emailrelay-start$(EXEEXT)
+@GCONFIG_WINDOWS_TRUE@am__EXEEXT_2 = emailrelay-service$(EXEEXT) \
+@GCONFIG_WINDOWS_TRUE@	emailrelay-textmode$(EXEEXT)
+PROGRAMS = $(e_libexec_PROGRAMS) $(sbin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
@@ -129,12 +135,6 @@ am__objects_3 = serviceimp_win32.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@am_libmain_a_OBJECTS = $(am__objects_3) \
 @GCONFIG_WINDOWS_TRUE@	$(am__objects_2)
 libmain_a_OBJECTS = $(am_libmain_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(e_libexecdir)" "$(DESTDIR)$(sbindir)" \
-	"$(DESTDIR)$(e_spooldir)"
-@GCONFIG_MAC_TRUE@am__EXEEXT_1 = emailrelay-start$(EXEEXT)
-@GCONFIG_WINDOWS_TRUE@am__EXEEXT_2 = emailrelay-service$(EXEEXT) \
-@GCONFIG_WINDOWS_TRUE@	emailrelay-textmode$(EXEEXT)
-PROGRAMS = $(e_libexec_PROGRAMS) $(sbin_PROGRAMS)
 am__emailrelay_SOURCES_DIST = main.cpp commandline.h commandline.cpp \
 	configuration.h configuration.cpp legal.cpp legal.h output.cpp \
 	output.h run.cpp run.h winmain.cpp winapp.cpp winapp.h \
@@ -249,9 +249,21 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/commandline.Po \
+	./$(DEPDIR)/configuration.Po ./$(DEPDIR)/filter.Po \
+	./$(DEPDIR)/legal.Po ./$(DEPDIR)/licence.Po \
+	./$(DEPDIR)/main.Po ./$(DEPDIR)/news.Po ./$(DEPDIR)/options.Po \
+	./$(DEPDIR)/output.Po ./$(DEPDIR)/passwd.Po ./$(DEPDIR)/run.Po \
+	./$(DEPDIR)/servicecontrol_unix.Po \
+	./$(DEPDIR)/servicecontrol_win32.Po \
+	./$(DEPDIR)/serviceimp_none.Po ./$(DEPDIR)/serviceimp_win32.Po \
+	./$(DEPDIR)/servicewrapper.Po ./$(DEPDIR)/start.Po \
+	./$(DEPDIR)/submit.Po ./$(DEPDIR)/winapp.Po \
+	./$(DEPDIR)/winform.Po ./$(DEPDIR)/winmain.Po \
+	./$(DEPDIR)/winmenu.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -336,7 +348,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -446,6 +458,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -482,6 +495,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -615,7 +629,7 @@ MISC_EXTRA_DIST = \
 @GCONFIG_WINDOWS_FALSE@	$(top_builddir)/src/gnet/libgnet.a \
 @GCONFIG_WINDOWS_FALSE@	$(top_builddir)/src/gssl/libgssl.a \
 @GCONFIG_WINDOWS_FALSE@	$(top_builddir)/src/glib/libglib.a \
-@GCONFIG_WINDOWS_FALSE@	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END)
+@GCONFIG_WINDOWS_FALSE@	$(GCONFIG_TLS_LIBS)
 
 @GCONFIG_WINDOWS_TRUE@emailrelay_LDADD = \
 @GCONFIG_WINDOWS_TRUE@	libmain.a \
@@ -627,8 +641,8 @@ MISC_EXTRA_DIST = \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/win32/libextra.a \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/glib/libglib.a \
 @GCONFIG_WINDOWS_TRUE@	$(RESOURCES) \
-@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
-@GCONFIG_WINDOWS_TRUE@	-lgdi32 -lws2_32 -liphlpapi -ladvapi32 -lcomctl32
+@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_TLS_LIBS) \
+@GCONFIG_WINDOWS_TRUE@	-lws2_32 -liphlpapi -lcomctl32
 
 @GCONFIG_WINDOWS_TRUE@emailrelay_textmode_SOURCES = $(TEXTMODE_MAIN_SOURCES) $(OTHER_SOURCES)
 @GCONFIG_WINDOWS_TRUE@emailrelay_textmode_LDFLAGS = -static
@@ -641,7 +655,7 @@ MISC_EXTRA_DIST = \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/gssl/libgssl.a \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/win32/libextra.a \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/glib/libglib.a \
-@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
+@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_TLS_LIBS) \
 @GCONFIG_WINDOWS_TRUE@	-lws2_32 -liphlpapi -lcomctl32
 
 emailrelay_passwd_SOURCES = passwd.cpp legal.cpp legal.h
@@ -650,12 +664,12 @@ emailrelay_passwd_SOURCES = passwd.cpp legal.cpp legal.h
 @GCONFIG_WINDOWS_FALSE@emailrelay_passwd_LDADD = \
 @GCONFIG_WINDOWS_FALSE@	$(top_builddir)/src/gssl/libgssl.a \
 @GCONFIG_WINDOWS_FALSE@	$(top_builddir)/src/glib/libglib.a \
-@GCONFIG_WINDOWS_FALSE@	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END)
+@GCONFIG_WINDOWS_FALSE@	$(GCONFIG_TLS_LIBS)
 
 @GCONFIG_WINDOWS_TRUE@emailrelay_passwd_LDADD = \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/gssl/libgssl.a \
 @GCONFIG_WINDOWS_TRUE@	$(top_builddir)/src/glib/libglib.a \
-@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_STATIC_START) $(GCONFIG_TLS_LIBS) $(GCONFIG_STATIC_END) \
+@GCONFIG_WINDOWS_TRUE@	$(GCONFIG_TLS_LIBS) \
 @GCONFIG_WINDOWS_TRUE@	-lws2_32 -liphlpapi -lcomctl32
 
 emailrelay_submit_SOURCES = submit.cpp legal.cpp legal.h
@@ -722,8 +736,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -734,14 +748,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libmain.a: $(libmain_a_OBJECTS) $(libmain_a_DEPENDENCIES) $(EXTRA_libmain_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libmain.a
-	$(AM_V_AR)$(libmain_a_AR) libmain.a $(libmain_a_OBJECTS) $(libmain_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libmain.a
 install-e_libexecPROGRAMS: $(e_libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(e_libexec_PROGRAMS)'; test -n "$(e_libexecdir)" || list=; \
@@ -827,6 +833,14 @@ uninstall-sbinPROGRAMS:
 clean-sbinPROGRAMS:
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libmain.a: $(libmain_a_OBJECTS) $(libmain_a_DEPENDENCIES) $(EXTRA_libmain_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmain.a
+	$(AM_V_AR)$(libmain_a_AR) libmain.a $(libmain_a_OBJECTS) $(libmain_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmain.a
+
 emailrelay$(EXEEXT): $(emailrelay_OBJECTS) $(emailrelay_DEPENDENCIES) $(EXTRA_emailrelay_DEPENDENCIES) 
 	@rm -f emailrelay$(EXEEXT)
 	$(AM_V_CXXLD)$(emailrelay_LINK) $(emailrelay_OBJECTS) $(emailrelay_LDADD) $(LIBS)
@@ -861,28 +875,34 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configuration.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/licence.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/news.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passwd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicecontrol_unix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicecontrol_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serviceimp_none.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serviceimp_win32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicewrapper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winapp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winform.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winmain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winmenu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configuration.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legal.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/licence.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/news.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passwd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicecontrol_unix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicecontrol_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serviceimp_none.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serviceimp_win32.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servicewrapper.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winapp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winform.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winmain.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winmenu.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1018,7 +1038,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1075,7 +1098,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(SCRIPTS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(e_libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(e_spooldir)"; do \
@@ -1117,7 +1140,28 @@ clean-am: clean-e_libexecPROGRAMS clean-generic clean-noinstLIBRARIES \
 	clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/commandline.Po
+	-rm -f ./$(DEPDIR)/configuration.Po
+	-rm -f ./$(DEPDIR)/filter.Po
+	-rm -f ./$(DEPDIR)/legal.Po
+	-rm -f ./$(DEPDIR)/licence.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/news.Po
+	-rm -f ./$(DEPDIR)/options.Po
+	-rm -f ./$(DEPDIR)/output.Po
+	-rm -f ./$(DEPDIR)/passwd.Po
+	-rm -f ./$(DEPDIR)/run.Po
+	-rm -f ./$(DEPDIR)/servicecontrol_unix.Po
+	-rm -f ./$(DEPDIR)/servicecontrol_win32.Po
+	-rm -f ./$(DEPDIR)/serviceimp_none.Po
+	-rm -f ./$(DEPDIR)/serviceimp_win32.Po
+	-rm -f ./$(DEPDIR)/servicewrapper.Po
+	-rm -f ./$(DEPDIR)/start.Po
+	-rm -f ./$(DEPDIR)/submit.Po
+	-rm -f ./$(DEPDIR)/winapp.Po
+	-rm -f ./$(DEPDIR)/winform.Po
+	-rm -f ./$(DEPDIR)/winmain.Po
+	-rm -f ./$(DEPDIR)/winmenu.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1164,7 +1208,28 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/commandline.Po
+	-rm -f ./$(DEPDIR)/configuration.Po
+	-rm -f ./$(DEPDIR)/filter.Po
+	-rm -f ./$(DEPDIR)/legal.Po
+	-rm -f ./$(DEPDIR)/licence.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/news.Po
+	-rm -f ./$(DEPDIR)/options.Po
+	-rm -f ./$(DEPDIR)/output.Po
+	-rm -f ./$(DEPDIR)/passwd.Po
+	-rm -f ./$(DEPDIR)/run.Po
+	-rm -f ./$(DEPDIR)/servicecontrol_unix.Po
+	-rm -f ./$(DEPDIR)/servicecontrol_win32.Po
+	-rm -f ./$(DEPDIR)/serviceimp_none.Po
+	-rm -f ./$(DEPDIR)/serviceimp_win32.Po
+	-rm -f ./$(DEPDIR)/servicewrapper.Po
+	-rm -f ./$(DEPDIR)/start.Po
+	-rm -f ./$(DEPDIR)/submit.Po
+	-rm -f ./$(DEPDIR)/winapp.Po
+	-rm -f ./$(DEPDIR)/winform.Po
+	-rm -f ./$(DEPDIR)/winmain.Po
+	-rm -f ./$(DEPDIR)/winmenu.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1185,13 +1250,13 @@ uninstall-am: uninstall-e_libexecPROGRAMS uninstall-e_spoolDATA \
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-e_libexecPROGRAMS clean-generic \
-	clean-noinstLIBRARIES clean-sbinPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-e_libexecPROGRAMS \
+	clean-generic clean-noinstLIBRARIES clean-sbinPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
 	install-e_libexecPROGRAMS install-e_spoolDATA install-exec \
 	install-exec-am install-exec-local install-html \
 	install-html-am install-info install-info-am install-man \
diff --git a/src/main/configuration.cpp b/src/main/configuration.cpp
index bc33b54..603fa8c 100644
--- a/src/main/configuration.cpp
+++ b/src/main/configuration.cpp
@@ -23,6 +23,7 @@
 #include "configuration.h"
 #include "commandline.h"
 #include "gmessagestore.h"
+#include "gaddress.h"
 #include "gprocess.h"
 #include "gformat.h"
 #include "ggettext.h"
@@ -523,14 +524,6 @@ G::StringArray Main::Configuration::semantics( bool want_errors ) const
 		errors.push_back( gettext("invalid --poll period: try --forward-on-disconnect") ) ;
 	}
 
-	if(
-		( m_map.contains("admin") && adminPort() == port() ) ||
-		( m_map.contains("pop") && popPort() == port() ) ||
-		( m_map.contains("pop") && m_map.contains("admin") && popPort() == adminPort() ) )
-	{
-		errors.push_back( gettext("the listening ports must be different") ) ;
-	}
-
 	if( ! m_map.contains("pop") && (
 		m_map.contains("pop-port") ||
 		m_map.contains("pop-auth") ||
@@ -738,6 +731,13 @@ G::StringArray Main::Configuration::semantics( bool want_errors ) const
 		errors.push_back( gettext("--dnsbl requires --remote-clients or -r") ) ;
 	}
 
+	std::string forward_to = serverAddress() ;
+
+	if( m_map.contains("client-interface") && GNet::Address::isFamilyLocal(forward_to) )
+	{
+		errors.push_back( "cannot use --client-interface with a unix-domain forwarding address" ) ;
+	}
+
 	// warnings...
 
 	const bool no_syslog =
diff --git a/src/main/emailrelay.rc b/src/main/emailrelay.rc
index 435c840..e224b23 100644
--- a/src/main/emailrelay.rc
+++ b/src/main/emailrelay.rc
@@ -1,78 +1,78 @@
-
-#include <windows.h>
-#include "resource.h"
-
-LANGUAGE 0x9,0x1
-1 11 "MSG00001.bin"
-
-IDD_PROPPAGE_1 DIALOGEX 0, 0, 259, 178
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Property Page"
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,245,164
-END
-
-IDD_DIALOG1 DIALOG 0, 0, 259, 190
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,105,169,50,14
-    EDITTEXT        IDC_EDIT1,7,7,245,153,ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
-IDD_DIALOG2 DIALOGEX 0, 0, 311, 194
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,130,174,50,14
-    EDITTEXT        IDC_EDIT1,7,7,297,163,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
-END
-
-IDI_ICON1               ICON                    "emailrelay-icon.ico"
-
-IDR_MENU1 MENU
-BEGIN
-    POPUP "popup"
-    BEGIN
-        MENUITEM "&Open",                       IDM_OPEN
-        MENUITEM "&Close",                      IDM_CLOSE
-        MENUITEM "&Quit",                       IDM_QUIT
-    END
-END
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2, 2, 0, 0
- PRODUCTVERSION 2, 2, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x10004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080904b0"
-        BEGIN
-            VALUE "Comments", "GPL v3 license"
-            VALUE "CompanyName", " "
-            VALUE "FileDescription", "E-MailRelay Application"
-            VALUE "FileVersion", "2, 2, 0, 0"
-            VALUE "InternalName", "emailrelay"
-            VALUE "LegalCopyright", "Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>"
-            VALUE "OriginalFilename", "emailrelay.exe"
-            VALUE "ProductName", "E-MailRelay"
-            VALUE "ProductVersion", "2, 2, 0, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x809, 1200
-    END
-END
-
+
+#include <windows.h>
+#include "resource.h"
+
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
+
+IDD_PROPPAGE_1 DIALOGEX 0, 0, 259, 178
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Property Page"
+FONT 8, "MS Shell Dlg", 400, 0, 0x0
+BEGIN
+    CONTROL         "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,245,164
+END
+
+IDD_DIALOG1 DIALOG 0, 0, 259, 190
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,105,169,50,14
+    EDITTEXT        IDC_EDIT1,7,7,245,153,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+END
+
+IDD_DIALOG2 DIALOGEX 0, 0, 311, 194
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,130,174,50,14
+    EDITTEXT        IDC_EDIT1,7,7,297,163,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+END
+
+IDI_ICON1               ICON                    "emailrelay-icon.ico"
+
+IDR_MENU1 MENU
+BEGIN
+    POPUP "popup"
+    BEGIN
+        MENUITEM "&Open",                       IDM_OPEN
+        MENUITEM "&Close",                      IDM_CLOSE
+        MENUITEM "&Quit",                       IDM_QUIT
+    END
+END
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2, 2, 1, 0
+ PRODUCTVERSION 2, 2, 1, 0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x10004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "Comments", "GPL v3 license"
+            VALUE "CompanyName", " "
+            VALUE "FileDescription", "E-MailRelay Application"
+            VALUE "FileVersion", "2, 2, 1, 0"
+            VALUE "InternalName", "emailrelay"
+            VALUE "LegalCopyright", "Copyright (C) 2001-2022 Graeme Walker <graeme_walker@users.sourceforge.net>"
+            VALUE "OriginalFilename", "emailrelay.exe"
+            VALUE "ProductName", "E-MailRelay"
+            VALUE "ProductVersion", "2, 2, 1, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
diff --git a/src/main/icon/Makefile.in b/src/main/icon/Makefile.in
index 34d65cb..b9a7f44 100644
--- a/src/main/icon/Makefile.in
+++ b/src/main/icon/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -215,6 +215,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -251,6 +252,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -303,8 +305,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -343,7 +345,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/src/main/messages.mc b/src/main/messages.mc
index 2927af8..2174f2d 100644
--- a/src/main/messages.mc
+++ b/src/main/messages.mc
@@ -1,65 +1,65 @@
-
-SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS
- Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
- Warning=0x2:STATUS_SEVERITY_WARNING
- Error=0x3:STATUS_SEVERITY_ERROR
-)
-
-FacilityNames=(Application=0x0:FACILITY_APPLICATION
-)
-
-MessageId=0x1
-SymbolicName=CATEGORY_1
-Language=English
-General
-.
-
-MessageIdTypedef=DWORD
-
-MessageId=1001
-Severity=Informational
-Facility=Application
-SymbolicName=MSG_INFO
-Language=English
-%1!S!
-.
-
-MessageId=1002
-Severity=Warning
-Facility=Application
-SymbolicName=MSG_WARNING
-Language=English
-%1!S!
-.
-
-MessageId=1003
-Severity=Error
-Facility=Application
-SymbolicName=MSG_ERROR
-Language=English
-%1!S!
-.
-
-MessageId=1011
-Severity=Informational
-Facility=Application
-SymbolicName=MSG_INFO
-Language=English
-%1
-.
-
-MessageId=1012
-Severity=Warning
-Facility=Application
-SymbolicName=MSG_WARNING
-Language=English
-%1
-.
-
-MessageId=1013
-Severity=Error
-Facility=Application
-SymbolicName=MSG_ERROR
-Language=English
-%1
-.
+
+SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS
+ Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
+ Warning=0x2:STATUS_SEVERITY_WARNING
+ Error=0x3:STATUS_SEVERITY_ERROR
+)
+
+FacilityNames=(Application=0x0:FACILITY_APPLICATION
+)
+
+MessageId=0x1
+SymbolicName=CATEGORY_1
+Language=English
+General
+.
+
+MessageIdTypedef=DWORD
+
+MessageId=1001
+Severity=Informational
+Facility=Application
+SymbolicName=MSG_INFO
+Language=English
+%1!S!
+.
+
+MessageId=1002
+Severity=Warning
+Facility=Application
+SymbolicName=MSG_WARNING
+Language=English
+%1!S!
+.
+
+MessageId=1003
+Severity=Error
+Facility=Application
+SymbolicName=MSG_ERROR
+Language=English
+%1!S!
+.
+
+MessageId=1011
+Severity=Informational
+Facility=Application
+SymbolicName=MSG_INFO
+Language=English
+%1
+.
+
+MessageId=1012
+Severity=Warning
+Facility=Application
+SymbolicName=MSG_WARNING
+Language=English
+%1
+.
+
+MessageId=1013
+Severity=Error
+Facility=Application
+SymbolicName=MSG_ERROR
+Language=English
+%1
+.
diff --git a/src/main/resource.h b/src/main/resource.h
index 732e2e9..3d006d6 100644
--- a/src/main/resource.h
+++ b/src/main/resource.h
@@ -1,15 +1,15 @@
-
-#define IDI_ICON1                       101
-#define IDD_DIALOG1                     101
-#define IDR_MENU1                       102
-#define IDD_DIALOG2                     103
-#define IDD_PROPPAGE_1                  106
-#define IDC_EDIT1                       1000
-#define IDC_LIST1                       1000
-#define IDS_EVENTLOG_INFORMATION        1001
-#define IDS_EVENTLOG_WARNING            1002
-#define IDS_EVENTLOG_ERROR              1003
-#define IDM_OPEN                        40001
-#define IDM_QUIT                        40002
-#define IDM_CLOSE                       40005
-
+
+#define IDI_ICON1                       101
+#define IDD_DIALOG1                     101
+#define IDR_MENU1                       102
+#define IDD_DIALOG2                     103
+#define IDD_PROPPAGE_1                  106
+#define IDC_EDIT1                       1000
+#define IDC_LIST1                       1000
+#define IDS_EVENTLOG_INFORMATION        1001
+#define IDS_EVENTLOG_WARNING            1002
+#define IDS_EVENTLOG_ERROR              1003
+#define IDM_OPEN                        40001
+#define IDM_QUIT                        40002
+#define IDM_CLOSE                       40005
+
diff --git a/src/main/run.cpp b/src/main/run.cpp
index 1d970da..68d703c 100644
--- a/src/main/run.cpp
+++ b/src/main/run.cpp
@@ -68,7 +68,7 @@ namespace { std::string localedir() { return std::string() ; } }
 
 std::string Main::Run::versionNumber()
 {
-	return "2.2" ;
+	return "2.2.1" ;
 }
 
 Main::Run::Run( Main::Output & output , const G::Arg & arg , bool is_windows , bool has_gui ) :
@@ -83,6 +83,7 @@ Main::Run::Run( Main::Output & output , const G::Arg & arg , bool is_windows , b
 {
 	m_client_ptr.deletedSignal().connect( G::Slot::slot(*this,&Run::onClientDone) ) ;
 	m_client_ptr.eventSignal().connect( G::Slot::slot(*this,&Run::onClientEvent) ) ;
+	m_forward_request_signal.connect( G::Slot::slot(*this,&Run::onForwardRequest) ) ;
 
 	// initialise gettext() early iff "--localedir" is used
 	std::string ldir = localedir() ;
@@ -111,6 +112,7 @@ Main::Run::~Run()
 	if( m_smtp_server ) m_smtp_server->eventSignal().disconnect() ;
 	if( m_store ) m_store->messageStoreRescanSignal().disconnect() ;
 	if( m_monitor ) m_monitor->signal().disconnect() ;
+	m_forward_request_signal.disconnect() ;
 	m_client_ptr.deletedSignal().disconnect() ;
 	m_client_ptr.eventSignal().disconnect() ;
 }
@@ -287,9 +289,10 @@ void Main::Run::run()
 	m_monitor = std::make_unique<GNet::Monitor>() ;
 	m_monitor->signal().connect( G::Slot::slot(*this,&Run::onNetworkEvent) ) ;
 
-	// early check of the forward-to address
+	// early check that the forward-to address can be resolved
 	//
-	if( configuration().log() && !configuration().serverAddress().empty() && !configuration().forwardOnStartup() )
+	if( configuration().log() && !configuration().serverAddress().empty() && !configuration().forwardOnStartup() &&
+		!GNet::Address::isFamilyLocal( configuration().serverAddress() ) )
 	{
 		GNet::Location location( configuration().serverAddress() , resolverFamily() ) ;
 		std::string error = GNet::Resolver::resolve( location ) ;
@@ -361,7 +364,7 @@ void Main::Run::run()
 			*m_store ,
 			*m_client_secrets ,
 			*m_server_secrets ,
-			serverConfig() ,
+			smtpServerConfig() ,
 			configuration().immediate() ? configuration().serverAddress() : std::string() ,
 			clientConfig() ) ;
 
@@ -391,7 +394,9 @@ void Main::Run::run()
 			m_es_rethrow ,
 			configuration() ,
 			*m_store ,
+			m_forward_request_signal ,
 			GNet::ServerPeerConfig(0U) ,
+			netServerConfig() ,
 			clientConfig() ,
 			*m_client_secrets ,
 			versionNumber() ) ;
@@ -492,7 +497,7 @@ void Main::Run::checkPort( bool check , const std::string & ip , unsigned int po
 			}
 			else if( GNet::Address::validStrings(ip,"0") )
 			{
-				GNet::Address address( ip , port ) ;
+				GNet::Address address = GNet::Address::parse( ip , port ) ;
 				GNet::Server::canBind( address , do_throw ) ;
 			}
 		}
@@ -554,7 +559,14 @@ GSmtp::ServerProtocol::Config Main::Run::serverProtocolConfig() const
 			.set_allow_pipelining( configuration().smtpPipelining() ) ;
 }
 
-GSmtp::Server::Config Main::Run::serverConfig() const
+GNet::ServerConfig Main::Run::netServerConfig() const
+{
+	bool open = configuration().user().empty() || configuration().user() == "root" ;
+	return GNet::ServerConfig()
+		.set_uds_open_permissions( open ) ;
+}
+
+GSmtp::Server::Config Main::Run::smtpServerConfig() const
 {
 	return
 		GSmtp::Server::Config()
@@ -568,6 +580,7 @@ GSmtp::Server::Config Main::Run::serverConfig() const
 			.set_verifier_address( configuration().verifier().str() )
 			.set_verifier_timeout( configuration().filterTimeout() )
 			.set_server_peer_config( GNet::ServerPeerConfig(configuration().idleTimeout()) )
+			.set_server_config( netServerConfig() )
 			.set_protocol_config( serverProtocolConfig() )
 			.set_sasl_server_config( configuration().smtpSaslServerConfig() )
 			.set_dnsbl_config( configuration().dnsbl() ) ;
@@ -583,6 +596,7 @@ GPop::Server::Config Main::Run::popConfig() const
 			.set_server_peer_config(
 				GNet::ServerPeerConfig()
 					.set_idle_timeout( configuration().idleTimeout()) )
+			.set_server_config( netServerConfig() )
 			.set_sasl_server_config( configuration().popSaslServerConfig() ) ;
 }
 
@@ -617,7 +631,7 @@ GNet::Address Main::Run::asAddress( const std::string & s )
 	// (port number is optional)
 	return s.empty() ?
 		GNet::Address::defaultAddress() :
-		( GNet::Address::validString(s) ? GNet::Address(s) : GNet::Address(s,0U) ) ;
+		( GNet::Address::validString(s,GNet::Address::NotLocal()) ? GNet::Address::parse(s,GNet::Address::NotLocal()) : GNet::Address::parse(s,0U) ) ;
 }
 
 void Main::Run::onPollTimeout()
@@ -627,6 +641,11 @@ void Main::Run::onPollTimeout()
 	requestForwarding( "poll" ) ;
 }
 
+void Main::Run::onForwardRequest( const std::string & reason )
+{
+	requestForwarding( reason ) ;
+}
+
 void Main::Run::requestForwarding( const std::string & reason )
 {
 	G_ASSERT( m_forwarding_timer != nullptr ) ;
@@ -796,10 +815,11 @@ int Main::Run::resolverFamily() const
 {
 	// choose an address family for the DNS lookup based on the "--client-interface" address
 	std::string client_bind_address = configuration().clientBindAddress() ;
-	return
-		client_bind_address.empty() ?
-			AF_UNSPEC :
-			asAddress(client_bind_address).domain() ;
+	if( client_bind_address.empty() )
+		return AF_UNSPEC ;
+
+	GNet::Address address = asAddress( client_bind_address ) ;
+	return ( address.af() == AF_INET || address.af() == AF_INET6 ) ? address.af() : AF_UNSPEC ;
 }
 
 void Main::Run::checkScripts() const
@@ -856,7 +876,8 @@ G::Path Main::Run::appDir() const
 
 std::unique_ptr<GSmtp::AdminServer> Main::Run::newAdminServer( GNet::ExceptionSink es ,
 	const Configuration & cfg , GSmtp::MessageStore & store ,
-	const GNet::ServerPeerConfig & server_peer_config ,
+	G::Slot::Signal<const std::string&> & forward_request_signal ,
+	const GNet::ServerPeerConfig & server_peer_config , const GNet::ServerConfig & net_server_config ,
 	const GSmtp::Client::Config & client_config , const GAuth::Secrets & client_secrets ,
 	const std::string & version_number )
 {
@@ -873,7 +894,9 @@ std::unique_ptr<GSmtp::AdminServer> Main::Run::newAdminServer( GNet::ExceptionSi
 	return std::make_unique<GSmtp::AdminServer>(
 			es ,
 			store ,
+			forward_request_signal ,
 			server_peer_config ,
+			net_server_config ,
 			client_config ,
 			client_secrets ,
 			cfg.listeningAddresses("admin") ,
diff --git a/src/main/run.h b/src/main/run.h
index ada87af..54ecf1d 100644
--- a/src/main/run.h
+++ b/src/main/run.h
@@ -135,6 +135,7 @@ private:
 	std::string smtpIdent() const ;
 	void recordPid() ;
 	const CommandLine & commandline() const ;
+	void onForwardRequest( const std::string & ) ; // m_forward_request_signal
 	void onClientDone( const std::string & ) ; // Client::doneSignal()
 	void onClientEvent( const std::string & , const std::string & , const std::string & ) ; // Client::eventSignal()
 	void onServerEvent( const std::string & , const std::string & ) ; // Server::eventSignal()
@@ -152,7 +153,8 @@ private:
 	static void checkPort( bool , const std::string & , unsigned int ) ;
 	GSmtp::Client::Config clientConfig() const ;
 	GSmtp::ServerProtocol::Config serverProtocolConfig() const ;
-	GSmtp::Server::Config serverConfig() const ;
+	GSmtp::Server::Config smtpServerConfig() const ;
+	GNet::ServerConfig netServerConfig() const ;
 	int resolverFamily() const ;
 	static GNet::Address asAddress( const std::string & ) ;
 	GPop::Server::Config popConfig() const ;
@@ -164,8 +166,11 @@ private:
 	static std::string buildConfiguration() ;
 	G::Path appDir() const ;
 	std::unique_ptr<GSmtp::AdminServer> newAdminServer( GNet::ExceptionSink ,
-		const Configuration & , GSmtp::MessageStore & , const GNet::ServerPeerConfig & ,
-		const GSmtp::Client::Config & , const GAuth::Secrets & , const std::string & ) ;
+		const Configuration & , GSmtp::MessageStore & ,
+		G::Slot::Signal<const std::string&> & ,
+		const GNet::ServerPeerConfig & ,
+		const GNet::ServerConfig & , const GSmtp::Client::Config & ,
+		const GAuth::Secrets & , const std::string & ) ;
 
 private:
 	Output & m_output ;
@@ -173,6 +178,7 @@ private:
 	GNet::ExceptionSink m_es_nothrow ;
 	bool m_is_windows ;
 	G::Arg m_arg ;
+	G::Slot::Signal<const std::string&> m_forward_request_signal ;
 	G::Slot::Signal<std::string,std::string,std::string,std::string> m_signal ;
 	std::unique_ptr<CommandLine> m_commandline ;
 	std::unique_ptr<Configuration> m_configuration ;
diff --git a/src/main/submit.cpp b/src/main/submit.cpp
index 1390970..177691b 100644
--- a/src/main/submit.cpp
+++ b/src/main/submit.cpp
@@ -62,8 +62,13 @@
 
 G_EXCEPTION_CLASS( NoBody , "no body text" ) ;
 
+std::string versionNumber()
+{
+	return "2.2.1" ;
+}
+
 static std::string writeFiles( const G::Path & spool_dir ,
-	const G::StringArray & to_list , const std::string & from ,
+	const G::StringArray & envelope_to_list , const std::string & from ,
 	const std::string & from_auth_in , const std::string & from_auth_out ,
 	const G::StringArray & content , std::istream & instream )
 {
@@ -75,7 +80,7 @@ static std::string writeFiles( const G::Path & spool_dir ,
 
 	// add "To:" lines to the envelope
 	//
-	for( auto to : to_list )
+	for( auto to : envelope_to_list )
 	{
 		G::Str::trim( to , {" \t\r\n",4U} ) ;
 		GSmtp::VerifierStatus status( to ) ;
@@ -121,7 +126,7 @@ static void copyIntoSubDirectories( const G::Path & content_path )
 	std::string envelope_filename = content_path.withExtension("envelope").basename() ;
 	G::Path src = spool_dir.path() + envelope_filename ;
 
-	G::Process::Umask::set( G::Process::Umask::Mode::Tighter ) ; // 0117 => -rw-rw----
+	G::Process::Umask set_umask( G::Process::Umask::Mode::Tighter ) ; // 0117 => -rw-rw----
 	unsigned int dir_count = 0U ;
 	unsigned int copy_count = 0U ;
 	G::DirectoryIterator iter( spool_dir ) ;
@@ -162,12 +167,13 @@ static void run( const G::Arg & arg )
 		"c!copy!copy into spool sub-directories!!0!!2|"
 		"n!filename!prints the name of the created content file!!0!!2|"
 
-		"C!content!set a line of content! and ignore stdin!2!base64!3|"
+		"C!content!sets a line of content! and ignores stdin!2!base64!3|"
 		"a!auth!sets the envelope authentication value!!1!name!3|"
 		"i!from-auth-in!sets the envelope from-auth-in value!!1!name!3|"
 		"o!from-auth-out!sets the envelope from-auth-out value!!1!name!3|"
 
-		"h!help!shows this help!!0!!2"
+		"h!help!shows this help!!0!!2|"
+		"V!version!prints the version and exits!!0!!2|"
 	) ;
 
 	if( opt.hasErrors() )
@@ -192,6 +198,10 @@ static void run( const G::Arg & arg )
 			<< Main::Legal::copyright()
 			<< std::endl ;
 	}
+	else if( opt.contains("version") )
+	{
+		std::cout << versionNumber() << std::endl ;
+	}
 	else if( opt.args().c() == 1U )
 	{
 		std::cerr
@@ -215,9 +225,9 @@ static void run( const G::Arg & arg )
 			( opt.value("from-auth-out","").empty() ? std::string("<>") : G::Xtext::encode(opt.value("from-auth-out","")) ) :
 			std::string() ;
 
-		// prepare the to-list
-		G::StringArray opt_to_list = opt.args().array(1U) ;
-		std::for_each( opt_to_list.begin() , opt_to_list.end() ,
+		// prepare the envelope-to-list from command-line args
+		G::StringArray envelope_to_list = opt.args().array(1U) ;
+		std::for_each( envelope_to_list.begin() , envelope_to_list.end() ,
 			[](std::string &to){if(!to.empty()&&to[0]=='\\')to=to.substr(1U);} ) ;
 
 		// allow @app in the spool-dir
@@ -247,7 +257,7 @@ static void run( const G::Arg & arg )
 			}
 		}
 
-		// find the 'from' address if necessary from the headers
+		// find an 'envelope-from' address if necessary from the headers
 		std::string from = opt_from ;
 		bool from_in_headers = false ;
 		if( from.empty() )
@@ -270,17 +280,27 @@ static void run( const G::Arg & arg )
 		// add synthetic content headers
 		if( opt_content_date )
 		{
-			auto now = G::SystemTime::now() ;
-			auto tm = now.local() ;
-			G::Date date( tm ) ;
-			std::string zone = G::DateTime::offsetString( G::DateTime::offset(now) ) ;
-			std::string date_str = date.dd() + " " + date.monthName(true) + " " + date.yyyy() ;
-			std::string time_str = G::Time(tm).hhmmss(":") ;
-			content.insert( content.begin() , G::Str::join(" ","Date:",date_str,time_str,zone) ) ;
+			bool have_date = false ;
+			for( const auto & line : content )
+			{
+				have_date = line.find("Date: ") == 0U ;
+				if( have_date || line.empty() )
+					break ;
+			}
+			if( !have_date )
+			{
+				auto now = G::SystemTime::now() ;
+				auto tm = now.local() ;
+				G::Date date( tm ) ;
+				std::string zone = G::DateTime::offsetString( G::DateTime::offset(now) ) ;
+				std::string date_str = date.dd() + " " + date.monthName(true) + " " + date.yyyy() ;
+				std::string time_str = G::Time(tm).hhmmss(":") ;
+				content.insert( content.begin() , G::Str::join(" ","Date:",date_str,time_str,zone) ) ;
+			}
 		}
-		if( opt_content_to )
+		if( opt_content_to ) // add 'envelope-to' addresses as content To: headers
 		{
-			for( const auto & to : opt_to_list )
+			for( const auto & to : envelope_to_list )
 				content.insert( content.begin() , "To: "+to ) ;
 		}
 		if( opt_content_from && !from_in_headers )
@@ -290,7 +310,7 @@ static void run( const G::Arg & arg )
 
 		// generate the two files
 		std::stringstream empty ;
-		std::string new_path = writeFiles( opt_spool_dir , opt_to_list , from ,
+		std::string new_path = writeFiles( opt_spool_dir , envelope_to_list , from ,
 			opt_from_auth_in , opt_from_auth_out , content ,
 			opt.contains("content") ? empty : std::cin ) ;
 
diff --git a/src/win32/Makefile.in b/src/win32/Makefile.in
index 4d677d6..6df6666 100644
--- a/src/win32/Makefile.in
+++ b/src/win32/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -99,7 +99,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -137,9 +137,16 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/empty.Po ./$(DEPDIR)/gappbase.Po \
+	./$(DEPDIR)/gappinst.Po ./$(DEPDIR)/gcontrol.Po \
+	./$(DEPDIR)/gcracker.Po ./$(DEPDIR)/gdc.Po \
+	./$(DEPDIR)/gdialog.Po ./$(DEPDIR)/gpump.Po \
+	./$(DEPDIR)/gscmap.Po ./$(DEPDIR)/gstack.Po \
+	./$(DEPDIR)/gtray.Po ./$(DEPDIR)/gwinbase.Po \
+	./$(DEPDIR)/gwindow.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -256,6 +263,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -292,6 +300,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -395,8 +404,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -422,19 +431,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empty.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gappbase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gappinst.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcontrol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcracker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gscmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstack.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtray.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwinbase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwindow.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empty.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gappbase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gappinst.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcontrol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcracker.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpump.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gscmap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstack.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtray.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwinbase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwindow.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -502,7 +517,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -571,7 +589,19 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/empty.Po
+	-rm -f ./$(DEPDIR)/gappbase.Po
+	-rm -f ./$(DEPDIR)/gappinst.Po
+	-rm -f ./$(DEPDIR)/gcontrol.Po
+	-rm -f ./$(DEPDIR)/gcracker.Po
+	-rm -f ./$(DEPDIR)/gdc.Po
+	-rm -f ./$(DEPDIR)/gdialog.Po
+	-rm -f ./$(DEPDIR)/gpump.Po
+	-rm -f ./$(DEPDIR)/gscmap.Po
+	-rm -f ./$(DEPDIR)/gstack.Po
+	-rm -f ./$(DEPDIR)/gtray.Po
+	-rm -f ./$(DEPDIR)/gwinbase.Po
+	-rm -f ./$(DEPDIR)/gwindow.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -617,7 +647,19 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/empty.Po
+	-rm -f ./$(DEPDIR)/gappbase.Po
+	-rm -f ./$(DEPDIR)/gappinst.Po
+	-rm -f ./$(DEPDIR)/gcontrol.Po
+	-rm -f ./$(DEPDIR)/gcracker.Po
+	-rm -f ./$(DEPDIR)/gdc.Po
+	-rm -f ./$(DEPDIR)/gdialog.Po
+	-rm -f ./$(DEPDIR)/gpump.Po
+	-rm -f ./$(DEPDIR)/gscmap.Po
+	-rm -f ./$(DEPDIR)/gstack.Po
+	-rm -f ./$(DEPDIR)/gtray.Po
+	-rm -f ./$(DEPDIR)/gwinbase.Po
+	-rm -f ./$(DEPDIR)/gwindow.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -637,18 +679,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 1276463..f60b6ee 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -96,6 +96,7 @@ test_names = \
 	testScannerPass.test \
 	testScannerBlock.test \
 	testScannerTimeout.test \
+	testScannerOverUnixDomainSockets.test \
 	testNetworkVerifierPass.test \
 	testNetworkVerifierFail.test \
 	testProxyConnectsOnce.test \
diff --git a/test/Makefile.in b/test/Makefile.in
index f961ad8..f74247b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -124,7 +124,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = emailrelay-test-scanner$(EXEEXT) \
@@ -190,9 +190,14 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/emailrelay_test_client.Po \
+	./$(DEPDIR)/emailrelay_test_keygen.Po \
+	./$(DEPDIR)/emailrelay_test_scanner.Po \
+	./$(DEPDIR)/emailrelay_test_server.Po \
+	./$(DEPDIR)/emailrelay_test_verifier.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -237,7 +242,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
+	check recheck distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -552,6 +557,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -588,6 +594,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -673,6 +680,7 @@ test_names = \
 	testScannerPass.test \
 	testScannerBlock.test \
 	testScannerTimeout.test \
+	testScannerOverUnixDomainSockets.test \
 	testNetworkVerifierPass.test \
 	testNetworkVerifierFail.test \
 	testProxyConnectsOnce.test \
@@ -816,8 +824,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -861,11 +869,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_keygen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_verifier.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_keygen.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_server.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emailrelay_test_verifier.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1100,7 +1114,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(check_SCRIPTS)
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1150,7 +1164,10 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1252,7 +1269,11 @@ clean-am: clean-checkPROGRAMS clean-generic clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/emailrelay_test_client.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_keygen.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_scanner.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_server.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_verifier.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1298,7 +1319,11 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/emailrelay_test_client.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_keygen.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_scanner.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_server.Po
+	-rm -f ./$(DEPDIR)/emailrelay_test_verifier.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1318,19 +1343,20 @@ uninstall-am:
 
 .MAKE: $(am__recursive_targets) check-am install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-TESTS check-am clean clean-checkPROGRAMS clean-generic \
-	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-noinstPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/test/Server.pm b/test/Server.pm
index dcd5e79..c8a9d6d 100644
--- a/test/Server.pm
+++ b/test/Server.pm
@@ -94,7 +94,7 @@ sub new
 		m_full_command => undef ,
 		m_filter => $filter ,
 		m_client_filter => $client_filter ,
-		m_scanner_port => $scanner_port ,
+		m_scanner_address => "${System::localhost}:${scanner_port}" ,
 		m_verifier_port => $verifier_port ,
 		m_max_size => 1000 ,
 	} , $classname ;
@@ -104,8 +104,8 @@ sub exe { return shift->{m_exe} }
 sub set_exe { $_[0]->{m_exe} = $_[1] }
 sub smtpPort { return shift->{m_smtp_port} }
 sub adminPort { return shift->{m_admin_port} }
-sub scannerPort { return shift->{m_scanner_port} }
-sub scannerAddress { return "net:$System::localhost:" . shift->{m_scanner_port} }
+sub scannerAddress { return shift->{m_scanner_address} }
+sub set_scannerAddress { $_[0]->{m_scanner_address} = $_[1] }
 sub verifierPort { return shift->{m_verifier_port} }
 sub verifierAddress { return "net:$System::localhost:" . shift->{m_verifier_port} }
 sub popPort { return shift->{m_pop_port} }
@@ -221,7 +221,7 @@ sub _set_all
 	$command_tail = _set( $command_tail , "__POLL_TIMEOUT__" , $this->pollTimeout() ) ;
 	$command_tail = _set( $command_tail , "__FILTER__" , $this->filter() ) ;
 	$command_tail = _set( $command_tail , "__CLIENT_FILTER__" , $this->clientFilter() ) ;
-	$command_tail = _set( $command_tail , "__SCANNER__" , $this->scannerAddress() ) ;
+	$command_tail = _set( $command_tail , "__SCANNER__" , "net:" . $this->scannerAddress() ) ;
 	$command_tail = _set( $command_tail , "__VERIFIER__" , $this->verifierAddress() ) ;
 	$command_tail = _set( $command_tail , "__CLIENT_SECRETS__" , $this->clientSecrets() ) ;
 	$command_tail = _set( $command_tail , "__MAX_SIZE__" , $this->maxSize() ) ;
diff --git a/test/certificates/Makefile.in b/test/certificates/Makefile.in
index eec7c70..d65e25b 100644
--- a/test/certificates/Makefile.in
+++ b/test/certificates/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/gconfig_defs.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -185,6 +185,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
 QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -221,6 +222,7 @@ e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -283,8 +285,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -302,7 +304,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/test/emailrelay-test.pl b/test/emailrelay-test.pl
index 356b81c..6629997 100644
--- a/test/emailrelay-test.pl
+++ b/test/emailrelay-test.pl
@@ -115,6 +115,11 @@ sub requireUnix
 		if !System::unix() ;
 }
 
+sub requireUnixDomainSockets
+{
+	requireUnix() ; # assume --with-uds
+}
+
 sub requireRoot
 {
 	# (typically called after requireUnix())
@@ -1208,7 +1213,7 @@ sub testScannerPass
 		Scanner => 1 ,
 	) ;
 	my $server = new Server() ;
-	my $scanner = new Scanner( $server->scannerPort() ) ;
+	my $scanner = new Scanner( $server->scannerAddress() ) ;
 	Check::ok( $server->run(\%args) , "failed to run" , $server->message() ) ;
 	Check::running( $server->pid() , $server->message() ) ;
 	$scanner->run() ;
@@ -1244,7 +1249,7 @@ sub testScannerBlock
 		Scanner => 1 ,
 	) ;
 	my $server = new Server() ;
-	my $scanner = new Scanner( $server->scannerPort() ) ;
+	my $scanner = new Scanner( $server->scannerAddress() ) ;
 	Check::ok( $server->run(\%args) , "failed to run" , $server->message() ) ;
 	Check::running( $server->pid() , $server->message() ) ;
 	$scanner->run() ;
@@ -1280,7 +1285,44 @@ sub testScannerTimeout
 		FilterTimeout => 1 ,
 	) ;
 	my $server = new Server() ;
-	my $scanner = new Scanner( $server->scannerPort() ) ;
+	my $scanner = new Scanner( $server->scannerAddress() ) ;
+	Check::ok( $server->run(\%args) , "failed to run" , $server->message() ) ;
+	Check::running( $server->pid() , $server->message() ) ;
+	$scanner->run() ;
+	my $smtp_client = new SmtpClient( $server->smtpPort() , $System::localhost ) ;
+	Check::ok( $smtp_client->open() ) ;
+
+	# test that the scanner times out
+	$smtp_client->submit_start() ;
+	$smtp_client->submit_line( "sleep 3" ) ;
+	$smtp_client->submit_line( "send foobar" ) ;
+	$smtp_client->submit_end( 1 ) ;
+	Check::fileDoesNotContain( $server->stderr() , "452 foobar" ) ;
+	Check::fileContains( $server->stderr() , "452 .*time.*out" ) ;
+
+	# tear down
+	$server->kill() ;
+	$scanner->kill() ;
+	$scanner->cleanup() ;
+	$server->cleanup() ;
+}
+
+sub testScannerOverUnixDomainSockets
+{
+	# setup
+	my %args = (
+		Log => 1 ,
+		Verbose => 1 ,
+		Domain => 1 ,
+		Port => 1 ,
+		SpoolDir => 1 ,
+		PidFile => 1 ,
+		Scanner => 1 ,
+	) ;
+	requireUnixDomainSockets() ;
+	my $server = new Server() ;
+	$server->set_scannerAddress( System::tempfile() ) ;
+	my $scanner = new Scanner( $server->scannerAddress() ) ;
 	Check::ok( $server->run(\%args) , "failed to run" , $server->message() ) ;
 	Check::running( $server->pid() , $server->message() ) ;
 	$scanner->run() ;
@@ -1289,11 +1331,12 @@ sub testScannerTimeout
 
 	# test that the scanner is used
 	$smtp_client->submit_start() ;
-	$smtp_client->submit_line( "sleep 3" ) ;
-	$smtp_client->submit_line( "send foobar" ) ;
-	$smtp_client->submit_end( 1 ) ;
-	Check::fileDoesNotContain( $server->stderr() , "452 foobar" ) ;
-	Check::fileContains( $server->stderr() , "452 .*time.*out" ) ;
+	$smtp_client->submit_line( "send ok" ) ; # (the test scanner treats the message body as a script)
+	$smtp_client->submit_end() ;
+	Check::fileContains( $scanner->logfile() , "new connection from (/|\\\\0)" ) ;
+	Check::fileContains( $scanner->logfile() , "send ok" ) ;
+	Check::fileDoesNotContain( $server->stderr() , "452 " ) ;
+	Check::fileMatchCount( $server->spoolDir()."/emailrelay.*.envelope" , 1 ) ;
 
 	# tear down
 	$server->kill() ;
diff --git a/test/emailrelay_test_scanner.cpp b/test/emailrelay_test_scanner.cpp
index 9725991..46621aa 100644
--- a/test/emailrelay_test_scanner.cpp
+++ b/test/emailrelay_test_scanner.cpp
@@ -19,7 +19,7 @@
 ///
 // A dummy network processor for testing "emailrelay --filter net:<host>:<port>".
 //
-// usage: emailrelay-test-scanner [--log] [--log-file <file>] [--debug] [--pid-file <pidfile>]
+// usage: emailrelay-test-scanner [--port <port-or-address>] [--log] [--log-file <file>] [--debug] [--pid-file <pidfile>]
 //
 // Listens on port 10020 by default. Each request is a 'content' filename
 // and the file should contain a mini script with commands of:
@@ -58,7 +58,7 @@ namespace Main
 class Main::ScannerPeer : public GNet::ServerPeer
 {
 public:
-	ScannerPeer( GNet::ExceptionSinkUnbound esu , GNet::ServerPeerInfo info ) ;
+	ScannerPeer( GNet::ExceptionSinkUnbound esu , GNet::ServerPeerInfo ) ;
 private:
 	void onDelete( const std::string & ) override ;
 	bool onReceive( const char * , std::size_t , std::size_t , std::size_t , char ) override ;
@@ -67,10 +67,10 @@ private:
 	bool processFile( std::string , std::string ) ;
 } ;
 
-Main::ScannerPeer::ScannerPeer( GNet::ExceptionSinkUnbound esu , GNet::ServerPeerInfo info ) :
-	ServerPeer(esu.bind(this),info,GNet::LineBufferConfig::autodetect())
+Main::ScannerPeer::ScannerPeer( GNet::ExceptionSinkUnbound esu , GNet::ServerPeerInfo peer_info ) :
+	ServerPeer(esu.bind(this),std::move(peer_info),GNet::LineBufferConfig::autodetect())
 {
-	G_LOG_S( "ScannerPeer::ctor: new connection from " << info.m_address.displayString() ) ;
+	G_LOG_S( "ScannerPeer::ctor: new connection from " << peerAddress().second.displayString() ) ;
 }
 
 void Main::ScannerPeer::onDelete( const std::string & )
@@ -180,14 +180,15 @@ bool Main::ScannerPeer::processFile( std::string path , std::string eol )
 class Main::Scanner : public GNet::Server
 {
 public:
-	Scanner( GNet::ExceptionSink , unsigned int port , unsigned int idle_timeout ) ;
+	Scanner( GNet::ExceptionSink , const GNet::Address & , unsigned int idle_timeout ) ;
 	~Scanner() override ;
 	std::unique_ptr<GNet::ServerPeer> newPeer( GNet::ExceptionSinkUnbound ebu , GNet::ServerPeerInfo ) override ;
 } ;
 
-Main::Scanner::Scanner( GNet::ExceptionSink es , unsigned int port , unsigned int idle_timeout ) :
-	GNet::Server( es , GNet::Address(GNet::Address::Family::ipv4,port) , GNet::ServerPeerConfig(idle_timeout) )
+Main::Scanner::Scanner( GNet::ExceptionSink es , const GNet::Address & address , unsigned int idle_timeout ) :
+	GNet::Server(es,address,GNet::ServerPeerConfig(idle_timeout),GNet::ServerConfig())
 {
+	G_LOG_S( "Scanner::ctor: listening on " << address.displayString() ) ;
 }
 
 Main::Scanner::~Scanner()
@@ -195,11 +196,11 @@ Main::Scanner::~Scanner()
 	serverCleanup() ; // base class early cleanup
 }
 
-std::unique_ptr<GNet::ServerPeer> Main::Scanner::newPeer( GNet::ExceptionSinkUnbound ebu , GNet::ServerPeerInfo info )
+std::unique_ptr<GNet::ServerPeer> Main::Scanner::newPeer( GNet::ExceptionSinkUnbound ebu , GNet::ServerPeerInfo peer_info )
 {
 	try
 	{
-		return std::unique_ptr<GNet::ServerPeer>( new ScannerPeer( ebu , info ) ) ;
+		return std::unique_ptr<GNet::ServerPeer>( new ScannerPeer( ebu , peer_info ) ) ;
 	}
 	catch( std::exception & e )
 	{
@@ -210,12 +211,12 @@ std::unique_ptr<GNet::ServerPeer> Main::Scanner::newPeer( GNet::ExceptionSinkUnb
 
 // ===
 
-static int run( unsigned int port , unsigned int idle_timeout )
+static int run( const GNet::Address & address , unsigned int idle_timeout )
 {
 	std::unique_ptr<GNet::EventLoop> event_loop= GNet::EventLoop::create() ;
 	GNet::ExceptionSink es ;
 	GNet::TimerList timer_list ;
-	Main::Scanner scanner( es , port , idle_timeout ) ;
+	Main::Scanner scanner( es , address , idle_timeout ) ;
 	event_loop->run() ;
 	return 0 ;
 }
@@ -228,10 +229,14 @@ int main( int argc , char * argv [] )
 		bool log = arg.remove("--log") ;
 		bool debug = arg.remove("--debug") ;
 		std::string log_file = arg.index("--log-file",1U) ? arg.v(arg.index("--log-file",1U)+1U) : std::string() ;
-		unsigned int port = arg.index("--port",1U) ? G::Str::toUInt(arg.v(arg.index("--port",1U)+1U)) : 10020U ;
+		std::string port_str = arg.index("--port",1U) ? arg.v(arg.index("--port",1U)+1U) : std::string("10020") ;
 		std::string pid_file = arg.index("--pid-file",1U) ? arg.v(arg.index("--pid-file",1U)+1U) : std::string() ;
 		unsigned int idle_timeout = 30U ;
 
+		GNet::Address address = G::Str::isNumeric(port_str) ?
+			GNet::Address( GNet::Address::Family::ipv4 , G::Str::toUInt(port_str) ) :
+			GNet::Address::parse( port_str ) ;
+
 		if( !pid_file.empty() )
 		{
 			std::ofstream file ;
@@ -240,7 +245,7 @@ int main( int argc , char * argv [] )
 		}
 
 		G::LogOutput log_output( log , debug , log_file ) ;
-		int rc = run( port , idle_timeout ) ;
+		int rc = run( address , idle_timeout ) ;
 		std::cout << "done" << std::endl ;
 		return rc ;
 	}
diff --git a/test/emailrelay_test_server.cpp b/test/emailrelay_test_server.cpp
index f36c121..85eb84f 100644
--- a/test/emailrelay_test_server.cpp
+++ b/test/emailrelay_test_server.cpp
@@ -126,7 +126,7 @@ public:
 } ;
 
 Server::Server( GNet::ExceptionSink es , Config config ) :
-	GNet::Server(es,GNet::Address(config.m_ipv6?GNet::Address::Family::ipv6:GNet::Address::Family::ipv4,config.m_port),GNet::ServerPeerConfig(config.m_idle_timeout)) ,
+	GNet::Server(es,GNet::Address(config.m_ipv6?GNet::Address::Family::ipv6:GNet::Address::Family::ipv4,config.m_port),GNet::ServerPeerConfig(config.m_idle_timeout),GNet::ServerConfig()) ,
 	m_config(config)
 {
 	if( m_config.m_slow )
diff --git a/test/emailrelay_test_verifier.cpp b/test/emailrelay_test_verifier.cpp
index 3a9d012..b7eb9c1 100644
--- a/test/emailrelay_test_verifier.cpp
+++ b/test/emailrelay_test_verifier.cpp
@@ -147,7 +147,7 @@ public:
 } ;
 
 Main::Verifier::Verifier( GNet::ExceptionSink es , bool ipv6 , unsigned int port , unsigned int idle_timeout ) :
-	GNet::Server( es , GNet::Address(ipv6?GNet::Address::Family::ipv6:GNet::Address::Family::ipv4,port) , GNet::ServerPeerConfig(idle_timeout) )
+	GNet::Server( es , GNet::Address(ipv6?GNet::Address::Family::ipv6:GNet::Address::Family::ipv4,port) , GNet::ServerPeerConfig(idle_timeout) , GNet::ServerConfig() )
 {
 }
 
diff --git a/winbuild.pl b/winbuild.pl
index 832d4cb..ec555c8 100644
--- a/winbuild.pl
+++ b/winbuild.pl
@@ -69,7 +69,7 @@ my $cmake_args = {
 } ;
 
 # version
-chomp( my $version = eval { FileHandle->new("VERSION")->gets() } || "2.2" ) ;
+chomp( my $version = eval { FileHandle->new("VERSION")->gets() } || "2.2.1" ) ;
 
 # makefile conditionals
 my %switches = (
@@ -102,6 +102,7 @@ my %vars = (
 	e_bsdinitdir => "c:/emailrelay" ,
 	e_rundir => "c:/emailrelay" ,
 	e_icondir => "c:/emailrelay" ,
+	e_trdir => "c:/emailrelay" ,
 	e_examplesdir => "c:/emailrelay" ,
 	e_libexecdir => "c:/emailrelay" ,
 	e_pamdir => "c:/emailrelay" ,
@@ -152,7 +153,7 @@ if( $no_cmake || $no_msbuild || $no_qt || $no_mbedtls )
 {
 	warn "error: missing prerequisites: please install the missing components" ,
 		( ($no_qt||$no_mbedtls) ? " or unset configuration items in winbuild.pl\n" : "\n" ) ;
-	die "error: missing prerequisites\n" ;
+	die "error: missing prerequisites\n" unless ( scalar(@ARGV) > 0 && $ARGV[0] eq "mingw" ) ;
 }
 
 # choose what to run ...
@@ -242,8 +243,8 @@ for my $part ( @run_parts )
 	}
 	elsif( $part eq "install" )
 	{
-		install( $install_x64 , "x64" , $switches{GCONFIG_GUI} ) ;
-		install( $install_x86 , "x86" , $switches{GCONFIG_GUI} ) ;
+		install( $install_x64 , "x64" , $qt_dirs , $switches{GCONFIG_GUI} ) ;
+		install( $install_x86 , "x86" , $qt_dirs , $switches{GCONFIG_GUI} ) ;
 	}
 	elsif( $part eq "mingw" )
 	{
@@ -291,7 +292,6 @@ sub create_cmake_file
 		if( $switches{GCONFIG_GUI} )
 		{
 			# see https://doc.qt.io/qt-5/cmake-get-started.html
-			#was print $fh "find_package(Qt5 CONFIG REQUIRED Widgets Gui Core OpenGL)\n" ;
 			print $fh "find_package(Qt5 COMPONENTS Widgets Gui Core OpenGL REQUIRED)\n" ;
 		}
 		if( $switches{GCONFIG_TLS_USE_MBEDTLS} || $switches{GCONFIG_TLS_USE_BOTH} )
@@ -476,6 +476,7 @@ sub run_generate
 sub run_cmake
 {
 	my ( $cmake , $mbedtls , $qt_dirs , $arch ) = @_ ;
+	$mbedtls ||= "." ;
 	$arch ||= "x64" ;
 
 	# (only full paths work here)
@@ -589,7 +590,7 @@ sub clean_mbedtls_files
 
 sub install
 {
-	my ( $install , $arch , $with_gui ) = @_ ;
+	my ( $install , $arch , $qt_dirs , $with_gui ) = @_ ;
 
 	my $msvc_base = winbuild::find_msvc_base( $arch ) ;
 	print "msvc-base=[$msvc_base]\n" ;
@@ -617,6 +618,10 @@ sub install
 		install_gui_dependencies( $msvc_base , $arch ,
 			{ exe => "$install/emailrelay-setup.exe" } ,
 			{ exe => "$install/payload/files/emailrelay-gui.exe" } ) ;
+
+		winbuild::translate( $arch , $qt_dirs , "no_NO" , "no" ) ;
+		install_copy( "src/gui/emailrelay.no.qm" , "$install/translations" ) ;
+		install_copy( "src/gui/emailrelay.no.qm" , "$install/payload/files/translations" ) ;
 	}
 
 	install_runtime( $runtime , $arch , $install ) ;
@@ -676,9 +681,9 @@ sub install_mingw
 		my $fh = new FileHandle( "$install_mingw/emailrelay-submit-test.bat" , "w" ) or die ;
 		my $cmd = "\@echo off\r\n" ;
 		$cmd .= "emailrelay-submit.exe -n -s \@app --from postmaster " ;
-		$cmd .= "-c U3ViamVjdDogdGVzdA== " ; # subject
-		$cmd .= "-c = " ;
-		$cmd .= "-c VGVzdCBtZXNzYWdl " ; # body
+		$cmd .= "-C U3ViamVjdDogdGVzdA== " ; # subject
+		$cmd .= "-C = " ;
+		$cmd .= "-C VGVzdCBtZXNzYWdl " ; # body
 		$cmd .= "-d -F -t " ;
 		$cmd .= "postmaster" ; # to
 		print $fh "$cmd\r\n" ;