diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index d09655ef7a..ce64a263b0 100644
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -11,7 +11,7 @@ symbols.
 
 From the top directory, run:
 
-  find . -name '*.[ch]' -type f -print | egrep -v '\+\+|s_lock.h' | xargs -n100 pgindent
+  find . -name '*.[ch]' -type f -print | grep -v 's_lock.h' | xargs -n100 pgindent
 
 The stock BSD indent has two bugs.  First, a comment after the word 'else'
 causes the rest of the file to be ignored.  Second, it silently ignores
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 9eae021aac..c6687cce1a 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -106,6 +106,9 @@ do
 	indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
 		-lp -nip -npro -bbb $EXTRA_OPTS \
 -TAES_KEY \
+-TAMT \
+-TAMTS \
+-TANY \
 -TASN1_BIT_STRING \
 -TASN1_BMPSTRING \
 -TASN1_BOOLEAN \
@@ -136,6 +139,7 @@ do
 -TASN1_UTF8STRING \
 -TASN1_VALUE \
 -TASN1_VISIBLESTRING \
+-TAV \
 -TA_Const \
 -TA_Expr \
 -TA_Expr_Kind \
@@ -208,11 +212,13 @@ do
 -TAuthRequest \
 -TBF_KEY \
 -TBIGNUM \
+-TBINOP \
 -TBIO \
 -TBIO_F_BUFFER_CTX \
 -TBIO_METHOD \
 -TBIO_dummy \
 -TBIT_STRING_BITNAME \
+-TBLOCK \
 -TBMS_Membership \
 -TBN_BLINDING \
 -TBN_CTX \
@@ -270,6 +276,8 @@ do
 -TCIRCLE \
 -TCOMP_CTX \
 -TCOMP_METHOD \
+-TCONDOP \
+-TCOP \
 -TCPFunction \
 -TCPPFunction \
 -TCRYPTO_EX_DATA \
@@ -280,6 +288,8 @@ do
 -TCRYPTO_EX_new \
 -TCRYPTO_MEM_LEAK_CB \
 -TCRYPTO_dynlock \
+-TCURCUR \
+-TCV \
 -TCacheCallbackFunction \
 -TCancelRequestPacket \
 -TCaseExpr \
@@ -300,6 +310,7 @@ do
 -TCheckPointStmt \
 -TChromosome \
 -TCity \
+-TClientData \
 -TClosePortalStmt \
 -TClosePtr \
 -TClusterStmt \
@@ -433,6 +444,7 @@ do
 -TEolType \
 -TErrorContextCallback \
 -TErrorData \
+-TExceptionLabelMap \
 -TExecContext \
 -TExecContextData \
 -TExecScanAccessMtd \
@@ -448,6 +460,7 @@ do
 -TExprDoneCond \
 -TExprState \
 -TExprStateEvalFunc \
+-TFF \
 -TFILE \
 -TFSMHeader \
 -TFSMPageData \
@@ -555,8 +568,11 @@ do
 -TGISTScanOpaque \
 -TGISTScanOpaqueData \
 -TGIST_SPLITVEC \
+-TGP \
 -TGUC_yy_size_t \
 -TGUC_yy_state_type \
+-TGV \
+-TGVOP \
 -TGene \
 -TGenericExprState \
 -TGeqoEvalData \
@@ -581,10 +597,13 @@ do
 -THASHHDR \
 -THASHSEGMENT \
 -THASH_SEQ_STATUS \
+-THE \
+-THEK \
 -THISTORY_STATE \
 -THIST_ENTRY \
 -THTAB \
 -THTSV_Result \
+-THV \
 -THash \
 -THashAllocFunc \
 -THashBuildState \
@@ -615,7 +634,13 @@ do
 -THeapTupleFields \
 -THeapTupleHeader \
 -THeapTupleHeaderData \
+-TI16 \
+-TI32 \
+-TI8 \
+-TIO \
 -TIOFuncSelector \
+-TIV \
+-TIV64 \
 -TIdList \
 -TInClauseInfo \
 -TIncrementVarSublevelsUp_context \
@@ -671,6 +696,7 @@ do
 -TItemOffset \
 -TItemPointer \
 -TItemPointerData \
+-TJMPENV \
 -TJoin \
 -TJoinExpr \
 -TJoinInfo \
@@ -690,6 +716,7 @@ do
 -TLHASH_HASH_FN_TYPE \
 -TLHASH_NODE \
 -TLINE \
+-TLISTOP \
 -TLOCALLOCK \
 -TLOCALLOCKOWNER \
 -TLOCALLOCKTAG \
@@ -698,6 +725,8 @@ do
 -TLOCKMETHODID \
 -TLOCKMODE \
 -TLOCKTAG \
+-TLOGOP \
+-TLOOP \
 -TLSEG \
 -TLVRelStats \
 -TLWLock \
@@ -722,10 +751,12 @@ do
 -TLogStmtLevel \
 -TLogicalTape \
 -TLogicalTapeSet \
+-TMAGIC \
 -TMD2_CTX \
 -TMD4_CTX \
 -TMD5_CTX \
 -TMDC2_CTX \
+-TMGVTBL \
 -TMaterial \
 -TMaterialPath \
 -TMaterialState \
@@ -745,6 +776,7 @@ do
 -TNUMDesc \
 -TNUMProc \
 -TNUM_poz \
+-TNV \
 -TName \
 -TNameData \
 -TNamespaceInfo \
@@ -764,6 +796,7 @@ do
 -TNumericDigit \
 -TNumericVar \
 -TOBJ_NAME \
+-TOP \
 -TObjectAddress \
 -TObjectAddresses \
 -TObjectClass \
@@ -784,6 +817,8 @@ do
 -TOperator \
 -TOprInfo \
 -TOutputContext \
+-TOutrec \
+-TPADOFFSET \
 -TPATH \
 -TPBE2PARAM \
 -TPBEPARAM \
@@ -791,6 +826,9 @@ do
 -TPEM_CTX \
 -TPEM_ENCODE_SEAL_CTX \
 -TPEM_USER \
+-TPERL_CONTEXT \
+-TPERL_SI \
+-TPGAsyncStatusType \
 -TPGErrorVerbosity \
 -TPGFInfoFunction \
 -TPGFunction \
@@ -798,16 +836,23 @@ do
 -TPGLZ_Header \
 -TPGLZ_HistEntry \
 -TPGLZ_Strategy \
+-TPGMessageField \
+-TPGNoticeHooks \
 -TPGPROC \
 -TPGSemaphore \
 -TPGSemaphoreData \
+-TPGSetenvStatusType \
 -TPGShmemHeader \
 -TPGTransactionStatusType \
 -TPGVerbosity \
 -TPG_Lock_Status \
 -TPGconn \
+-TPGlobjfuncs \
 -TPGnotify \
+-TPGresAttDesc \
+-TPGresAttValue \
 -TPGresult \
+-TPGresult_data \
 -TPKCS7 \
 -TPKCS7_DIGEST \
 -TPKCS7_ENCRYPT \
@@ -819,9 +864,54 @@ do
 -TPKCS7_SIGNER_INFO \
 -TPKCS7_SIGN_ENVELOPE \
 -TPKCS8_PRIV_KEY_INFO \
+-TPLPGSQL_YYSTYPE \
+-TPLpgSQL_arrayelem \
+-TPLpgSQL_condition \
+-TPLpgSQL_datum \
+-TPLpgSQL_diag_item \
+-TPLpgSQL_dstring \
+-TPLpgSQL_exception \
+-TPLpgSQL_exceptions \
+-TPLpgSQL_execstate \
+-TPLpgSQL_expr \
+-TPLpgSQL_func_hashkey \
+-TPLpgSQL_function \
+-TPLpgSQL_ns \
+-TPLpgSQL_nsitem \
+-TPLpgSQL_rec \
+-TPLpgSQL_recfield \
+-TPLpgSQL_row \
+-TPLpgSQL_stmt \
+-TPLpgSQL_stmt_assign \
+-TPLpgSQL_stmt_block \
+-TPLpgSQL_stmt_close \
+-TPLpgSQL_stmt_dynexecute \
+-TPLpgSQL_stmt_dynfors \
+-TPLpgSQL_stmt_execsql \
+-TPLpgSQL_stmt_exit \
+-TPLpgSQL_stmt_fetch \
+-TPLpgSQL_stmt_fori \
+-TPLpgSQL_stmt_fors \
+-TPLpgSQL_stmt_getdiag \
+-TPLpgSQL_stmt_if \
+-TPLpgSQL_stmt_loop \
+-TPLpgSQL_stmt_open \
+-TPLpgSQL_stmt_perform \
+-TPLpgSQL_stmt_raise \
+-TPLpgSQL_stmt_return \
+-TPLpgSQL_stmt_return_next \
+-TPLpgSQL_stmt_select \
+-TPLpgSQL_stmt_while \
+-TPLpgSQL_stmts \
+-TPLpgSQL_trigarg \
+-TPLpgSQL_type \
+-TPLpgSQL_var \
+-TPLpgSQL_variable \
+-TPMOP \
 -TPMSignalReason \
 -TPOLYGON \
 -TPQArgBlock \
+-TPQEnvironmentOption \
 -TPQExpBuffer \
 -TPQExpBufferData \
 -TPQconninfoOption \
@@ -832,6 +922,8 @@ do
 -TPROCLOCKTAG \
 -TPROC_HDR \
 -TPROC_QUEUE \
+-TPV \
+-TPVOP \
 -TPacketLen \
 -TPage \
 -TPageFreeSpaceInfo \
@@ -850,6 +942,8 @@ do
 -TPattern_Type \
 -TPendingOperationEntry \
 -TPendingRelDelete \
+-TPerlExitListEntry \
+-TPerlInterpreter \
 -TPgStat_Counter \
 -TPgStat_Info \
 -TPgStat_Msg \
@@ -903,6 +997,7 @@ do
 -TQuerySource \
 -TRC2_KEY \
 -TRC4_KEY \
+-TREGEXP \
 -TRIPEMD160_CTX \
 -TRI_QueryHashEntry \
 -TRI_QueryKey \
@@ -996,6 +1091,10 @@ do
 -TSSL_METHOD \
 -TSSL_SESSION \
 -TSTACK \
+-TSTRLEN \
+-TSUBLEXINFO \
+-TSV \
+-TSVOP \
 -TSaveArchivePtr \
 -TScalarArrayOpExpr \
 -TScalarArrayOpExprState \
@@ -1027,6 +1126,8 @@ do
 -TShmemIndexEnt \
 -TShutdownMode \
 -TSigHandler \
+-TSighandler_t \
+-TSigsave_t \
 -TSize \
 -TSlruCtl \
 -TSlruCtlData \
@@ -1068,7 +1169,101 @@ do
 -TTableDataInfo \
 -TTableInfo \
 -TTargetEntry \
+-TTclStubHooks \
+-TTclStubs \
+-TTcl_AppInitProc \
+-TTcl_AsyncHandler \
+-TTcl_AsyncProc \
+-TTcl_CallFrame \
+-TTcl_Channel \
+-TTcl_ChannelProc \
+-TTcl_ChannelType \
+-TTcl_ChannelTypeVersion \
+-TTcl_CloseProc \
+-TTcl_CmdDeleteProc \
+-TTcl_CmdInfo \
+-TTcl_CmdProc \
+-TTcl_CmdTraceProc \
+-TTcl_Command \
+-TTcl_Condition \
+-TTcl_CreateFileHandlerProc \
+-TTcl_DString \
+-TTcl_DeleteFileHandlerProc \
+-TTcl_DriverBlockModeProc \
+-TTcl_DriverClose2Proc \
+-TTcl_DriverCloseProc \
+-TTcl_DriverFlushProc \
+-TTcl_DriverGetHandleProc \
+-TTcl_DriverGetOptionProc \
+-TTcl_DriverHandlerProc \
+-TTcl_DriverInputProc \
+-TTcl_DriverOutputProc \
+-TTcl_DriverSeekProc \
+-TTcl_DriverSetOptionProc \
+-TTcl_DriverWatchProc \
+-TTcl_DupInternalRepProc \
+-TTcl_Encoding \
+-TTcl_EncodingConvertProc \
+-TTcl_EncodingFreeProc \
+-TTcl_EncodingState \
+-TTcl_EncodingType \
+-TTcl_EolTranslation \
+-TTcl_Event \
+-TTcl_EventCheckProc \
+-TTcl_EventDeleteProc \
+-TTcl_EventProc \
+-TTcl_EventSetupProc \
+-TTcl_ExitProc \
+-TTcl_FileFreeProc \
+-TTcl_FileProc \
+-TTcl_FreeInternalRepProc \
+-TTcl_FreeProc \
+-TTcl_HashEntry \
+-TTcl_HashSearch \
+-TTcl_HashTable \
+-TTcl_IdleProc \
+-TTcl_Interp \
+-TTcl_InterpDeleteProc \
+-TTcl_MainLoopProc \
+-TTcl_MathProc \
+-TTcl_Mutex \
+-TTcl_Namespace \
+-TTcl_NamespaceDeleteProc \
+-TTcl_NotifierProcs \
+-TTcl_Obj \
+-TTcl_ObjCmdProc \
+-TTcl_ObjType \
+-TTcl_PackageInitProc \
+-TTcl_PanicProc \
+-TTcl_Parse \
+-TTcl_PathType \
+-TTcl_Pid \
+-TTcl_QueuePosition \
+-TTcl_RegExp \
+-TTcl_RegExpIndices \
+-TTcl_RegExpInfo \
+-TTcl_SavedResult \
+-TTcl_SetFromAnyProc \
+-TTcl_SetTimerProc \
+-TTcl_Stat_ \
+-TTcl_TcpAcceptProc \
+-TTcl_ThreadCreateProc \
+-TTcl_ThreadDataKey \
+-TTcl_ThreadId \
+-TTcl_Time \
+-TTcl_TimerProc \
+-TTcl_TimerToken \
+-TTcl_Token \
+-TTcl_Trace \
+-TTcl_UniChar \
+-TTcl_UpdateStringProc \
+-TTcl_Value \
+-TTcl_ValueType \
+-TTcl_Var \
+-TTcl_VarTraceProc \
+-TTcl_WaitForEventProc \
 -TThingFile \
+-TThread \
 -TTidPath \
 -TTidScan \
 -TTidScanState \
@@ -1117,10 +1312,15 @@ do
 -TTypeCast \
 -TTypeInfo \
 -TTypeName \
+-TU16 \
+-TU32 \
+-TU8 \
 -TUI \
 -TUI_METHOD \
 -TUI_STRING \
 -TUNDO_LIST \
+-TUNOP \
+-TUV \
 -TUnique \
 -TUniquePath \
 -TUniquePathMethod \
@@ -1202,6 +1402,20 @@ do
 -TXLogRelDesc \
 -TXLogwrtResult \
 -TXLogwrtRqst \
+-TXPV \
+-TXPVAV \
+-TXPVBM \
+-TXPVCV \
+-TXPVFM \
+-TXPVGV \
+-TXPVHV \
+-TXPVIO \
+-TXPVIV \
+-TXPVLV \
+-TXPVMG \
+-TXPVNV \
+-TXPVUV \
+-TXRV \
 -TXactCallback \
 -TXactCallbackItem \
 -TXactEvent \
@@ -1247,12 +1461,17 @@ do
 -Tchr \
 -Tclock_t \
 -Tclockid_t \
+-Tcodes_t \
 -Tcolor \
+-Tcomment_t \
 -Tconst_DES_cblock \
 -Tcontain_var_reference_context \
 -Tcrc64 \
+-Tcv_flags_t \
 -Tdaddr_t \
+-Tdate \
 -Tdatetkn \
+-Tdecimal \
 -Tdeparse_context \
 -Tdeparse_namespace \
 -Tdev_t \
@@ -1262,9 +1481,11 @@ do
 -Teval_const_expressions_context \
 -TexecRowMark \
 -Texecution_state \
+-Texpectation \
 -Tf_smgr \
 -Tfd_mask \
 -Tfd_set \
+-Tfilter_t \
 -Tfinalize_primnode_context \
 -Tfind_expr_references_context \
 -Tfind_minimum_var_level_context \
@@ -1311,6 +1532,7 @@ do
 -Tint8 \
 -Tint8_t \
 -Tint8m_t \
+-Tinterval \
 -Tintf \
 -TitemIdSort \
 -TitemIdSortData \
@@ -1320,6 +1542,7 @@ do
 -TlclContext \
 -TlclTocEntry \
 -Tldiv_t \
+-Tline_t \
 -Tmacaddr \
 -Tmb2wchar_with_len_converter \
 -Tmbdisplaylen_converter \
@@ -1328,11 +1551,17 @@ do
 -Tmode_t \
 -Tnlink_t \
 -Tnls_uint32 \
+-Tnumeric \
 -Toff_t \
 -Toidvector \
+-Top_tr_array \
+-Topcode \
+-Topindex \
 -ToptType \
 -Tpcolor \
 -Tpem_password_cb \
+-TpgParameterStatus \
+-Tpg_conv_map \
 -Tpg_enc \
 -Tpg_enc2name \
 -Tpg_encname \
@@ -1345,6 +1574,11 @@ do
 -Tpgsql_thing_t \
 -Tpgthreadlock_t \
 -Tpid_t \
+-Tplperl_proc_desc \
+-Tplpgsql_HashEnt \
+-Tplpgsql_yysigned_char \
+-Tpltcl_proc_desc \
+-Tpltcl_query_desc \
 -Tpqbool \
 -Tpqsigfunc \
 -TprintQueryOpt \
@@ -1361,20 +1595,26 @@ do
 -Tptrdiff_t \
 -Tpull_var_clause_context \
 -Tpull_varnos_context \
+-Tpvcontents \
 -Tq128_t \
 -Tqaddr_t \
 -Tquad_t \
 -TrangeTableEntry_used_context \
 -Treduce_outer_joins_state \
+-Tregcomp_t \
 -Tregex_t \
+-Tregexec_t \
+-Tregexp \
 -Tregister_t \
 -Tregmatch_t \
+-Tregnode \
 -Tregoff_t \
 -Tregproc \
 -Treplace_vars_with_subplan_refs_context \
 -Trewrite_event \
 -Trm_detail_t \
 -Trune_t \
+-Trunops_proc_t \
 -Tsa_family_t \
 -Tsegsz_t \
 -Tsequence_magic \
@@ -1394,13 +1634,17 @@ do
 -Tssize_t \
 -Tssl_crock_st \
 -Tstack_t \
+-Tstrconst \
 -Tsubstitute_actual_parameters_context \
+-Tsvindex \
+-Tsvtype \
 -Tswblk_t \
 -Ttcflag_t \
 -Ttcp_seq \
 -TteReqs \
 -Ttext \
 -Ttime_t \
+-Ttimestamp \
 -Tts_db_fctx \
 -TuInt \
 -TuIntf \