- Renamed --with-xauth-path to --with-xauth
 - Added --with-pid-dir option
 - Released 1.2.1pre26
diff --git a/configure.in b/configure.in
index 06a7707..816f56e 100644
--- a/configure.in
+++ b/configure.in
@@ -24,8 +24,8 @@
 	]
 )
 
-AC_ARG_WITH(xauth-path,
-	[  --with-xauth-path=PATH  Specify path to xauth program ],
+AC_ARG_WITH(xauth,
+	[  --with-xauth=PATH       Specify path to xauth program ],
 	[
 		if test "x$withval" != "$xno" ; then
 			AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval")
@@ -651,6 +651,15 @@
 	]
 )
 
+AC_ARG_WITH(pid-dir,
+	[  --with-pid-dir=PATH     Specify location of ssh.pid file],
+	[
+		if test "x$withval" != "xno" ; then	
+			AC_DEFINE_UNQUOTED(PID_DIR, "$withval")
+		fi
+	]
+)
+
 dnl Check for mail directory (last resort if we cannot get it from headers)
 if test ! -z "$MAIL" ; then
 	maildir=`dirname $MAIL`