diff -Naur libreswan-3.19-orig/programs/ipsec/ipsec.in libreswan-3.19/programs/ipsec/ipsec.in
--- libreswan-3.19-orig/programs/ipsec/ipsec.in	2017-01-15 14:34:34.000000000 -0500
+++ libreswan-3.19/programs/ipsec/ipsec.in	2017-02-03 17:49:07.779187770 -0500
@@ -38,7 +38,7 @@
 PATH="${IPSEC_SBINDIR}":/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin
 export PATH
 
-# supress ElectricFence banner changing our reference testing output
+# suppress ElectricFence banner changing our reference testing output
 export EF_DISABLE_BANNER=1
 
 # things not to be listed in --help command list
@@ -216,10 +216,14 @@
 	    # A lot of nss commands use -d to specify NSS db location.
 	    # We use --nssdir.
 	    if [ "${2}" = "-d" -o \
+		"${2}" = "--configdir" -o \
 		"${2}" = "--nssdir" ]
 	    then
 		if [ -d "${3}" ]; then
 		    IPSEC_NSSDIR="${3}"
+		    if [ "${2}" = "--configdir" ]; then
+			echo "ipsec import warning: --configdir is obsoleted, use --nssdir" >&2
+		    fi
 		else
 		    echo "usage: ipsec import [--nssdir ${IPSEC_NSSDIR}] /path/to/pkcs.12" >&2
 		    exit 1
@@ -251,10 +255,14 @@
 	    # A lot of nss commands use -d to specify NSS db location.
 	    # We use --nssdir.
 	    if [ "${2}" = "-d" -o \
+		"${2}" = "--configdir" -o \
 		"${2}" = "--nssdir" ]
 	    then
 		IPSEC_NSSDIR="${3}"
 		IPSEC_NSSDIR_SQL="sql:${IPSEC_NSSDIR}"
+		if [ "${2}" = "--configdir" ]; then
+		    echo "ipsec initnss warning: --configdir is obsoleted, use --nssdir" >&2
+		fi
 	    else
 		echo "usage: ipsec initnss [--nssdir ${IPSEC_NSSDIR}]" >&2
 		exit 1
diff -Naur libreswan-3.19-orig/programs/newhostkey/newhostkey.in libreswan-3.19/programs/newhostkey/newhostkey.in
--- libreswan-3.19-orig/programs/newhostkey/newhostkey.in	2017-01-15 14:34:34.000000000 -0500
+++ libreswan-3.19/programs/newhostkey/newhostkey.in	2017-02-03 17:49:16.131142346 -0500
@@ -54,7 +54,7 @@
 	    exit 0
 	    ;;
 	--random)
-	    echo "$me warning: --random is obsoleted, using --seeddev"
+	    echo "$me warning: --random is obsoleted, using --seeddev" >&2
 	    seeddev="--seeddev ${2}"
 	    shift
 	    ;;
@@ -62,6 +62,11 @@
 	    seeddev="--seeddev ${2}"
 	    shift
 	    ;;
+	--configdir)
+	    echo "$me warning: --configdir is obsoleted, use --nssdir" >&2
+	    nssdir="${2}"
+	    shift
+	    ;;
 	--nssdir)
 	    nssdir="${2}"
 	    shift