diff --git a/src/include/mpir_request.h b/src/include/mpir_request.h
index ab8d4f8f1c5..5b6e537502d 100644
--- a/src/include/mpir_request.h
+++ b/src/include/mpir_request.h
@@ -371,7 +371,8 @@ extern MPIR_Request MPIR_Request_direct[MPIR_REQUEST_PREALLOC];
                 DEBUG_PROGREE_HOOK; \
                 progress_timed_out = true; \
             } else if (time_diff > MPIR_CVAR_PROGRESS_TIMEOUT * 2) { \
-                MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**timeout"); \
+                MPIR_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**progresstimeout", \
+                                     "**progresstimeout %d", MPIR_CVAR_PROGRESS_TIMEOUT); \
             } \
             iter = 0; \
         } \
diff --git a/src/mpi/errhan/errnames.txt b/src/mpi/errhan/errnames.txt
index 159a10ebb95..df31b28bb80 100644
--- a/src/mpi/errhan/errnames.txt
+++ b/src/mpi/errhan/errnames.txt
@@ -502,6 +502,8 @@ unexpected messages queued.
 #**argnull %s:Invalid null parameter %s
 **commstack:Internal overflow in stack used for MPI_Comm_split
 **timeout:Operation timed out
+**progresstimeout:Progress TIMEOUT. Check MPIR_CVAR_PROGRESS_TIMEOUT setting. Reset it to 0 to disable progress TIMEOUT. 
+**progresstimeout %d:Progress TIMEOUT due to MPIR_CVAR_PROGRESS_TIMEOUT set to %d (seconds). Reset it to 0 to disable progress TIMEOUT.
 **cmaread:process_vm_readv failed
 **cmaread %d:process_vm_readv failed (errno %d)
 **cmadata:process_vm_readv bytes mismatch