diff --git a/configure b/configure
index cf20fc73dc..3e749dd3f2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: b9f0c6267bea8fe495d4f2319f7262007138fe8c .
+# From configure.in Id: cca3b0bb7e994307d90812ef697fe15f78e5f6e9 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -826,7 +826,6 @@ with_subdir
 enable_debug
 enable_dynamic
 enable_syslog
-enable_proctitle
 enable_ipv6
 enable_local
 with_cyrus_sasl
@@ -1536,7 +1535,6 @@ Optional Features:
   --enable-debug 	  enable debugging no|yes|traditional [yes]
   --enable-dynamic	  enable linking built binaries with dynamic libs [auto]
   --enable-syslog	  enable syslog support [auto]
-  --enable-proctitle	  enable proctitle support [yes]
   --enable-ipv6 	  enable IPv6 support [auto]
   --enable-local	  enable AF_LOCAL (AF_UNIX) socket support [auto]
 
@@ -3025,27 +3023,6 @@ else
 fi
 
 # end --enable-syslog
-# OpenLDAP --enable-proctitle
-
-	# Check whether --enable-proctitle was given.
-if test "${enable_proctitle+set}" = set; then :
-  enableval=$enable_proctitle;
-	ol_arg=invalid
-	for ol_val in auto yes no ; do
-		if test "$enableval" = "$ol_val" ; then
-			ol_arg="$ol_val"
-		fi
-	done
-	if test "$ol_arg" = "invalid" ; then
-		as_fn_error $? "bad value $enableval for --enable-proctitle" "$LINENO" 5
-	fi
-	ol_enable_proctitle="$ol_arg"
-
-else
-  	ol_enable_proctitle=yes
-fi
-
-# end --enable-proctitle
 ol_enable_referrals=${ol_enable_referrals-no}
 # OpenLDAP --enable-ipv6
 
@@ -22871,72 +22848,6 @@ $as_echo "$as_me: WARNING: disabling crypt support" >&2;}
 	fi
 fi
 
-if test $ol_enable_proctitle != no ; then
-	ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes; then :
-  have_setproctitle=yes
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
-$as_echo_n "checking for setproctitle in -lutil... " >&6; }
-if ${ac_cv_lib_util_setproctitle+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setproctitle ();
-int
-main ()
-{
-return setproctitle ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_util_setproctitle=yes
-else
-  ac_cv_lib_util_setproctitle=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
-$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
-if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
-  have_setproctitle=yes
-			LUTIL_LIBS="$LUTIL_LIBS -lutil"
-else
-  have_setproctitle=no
-			case " $LIBOBJS " in
-  *" setproctitle.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS setproctitle.$ac_objext"
- ;;
-esac
-
-			LIBSRCS="$LIBSRCS setproctitle.c"
-fi
-
-fi
-
-
-	if test $have_setproctitle = yes ; then
-
-$as_echo "#define HAVE_SETPROCTITLE 1" >>confdefs.h
-
-	fi
-fi
-
 if test $ol_enable_slp != no ; then
 	for ac_header in slp.h
 do :
@@ -24583,11 +24494,6 @@ if test "$ol_enable_syslog" = yes ; then
 
 $as_echo "#define LDAP_SYSLOG 1" >>confdefs.h
 
-fi
-if test "$ol_enable_proctitle" != no ; then
-
-$as_echo "#define LDAP_PROCTITLE 1" >>confdefs.h
-
 fi
 if test "$ol_enable_referrals" != no ; then
 
diff --git a/include/portable.hin b/include/portable.hin
index a785d09763..00a63959d5 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -825,9 +825,6 @@
 /* define to support PF_LOCAL */
 #undef LDAP_PF_LOCAL
 
-/* define this for LDAP process title support */
-#undef LDAP_PROCTITLE
-
 /* define this to add SLAPI code */
 #undef LDAP_SLAPI