diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index 58c3df7..4398fd9 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -1151,8 +1151,9 @@
 	 * @param			Delay in milliseconds.
 	 *
 	 */
-	LIB3270_EXPORT void lib3270_set_unlock_delay(H3270 *session, unsigned short delay);
+	LIB3270_EXPORT void lib3270_set_unlock_delay(H3270 *session, int delay);
 
+	LIB3270_EXPORT int lib3270_get_unlock_delay(H3270 *session);
 
 	/**
 	 * @brief Alloc/Realloc memory buffer.
diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c
index 6e0dfd6..bd7e3e1 100644
--- a/src/lib3270/kybd.c
+++ b/src/lib3270/kybd.c
@@ -2922,11 +2922,19 @@ int kybd_prime(H3270 *hSession)
 }
 #endif /*]*/
 
-LIB3270_EXPORT void lib3270_set_unlock_delay(H3270 *session, unsigned short delay)
+LIB3270_EXPORT void lib3270_set_unlock_delay(H3270 *session, int delay)
 {
 	CHECK_SESSION_HANDLE(session);
 
 	trace("%s(%d)",__FUNCTION__,(int) delay);
 
-	session->unlock_delay_ms = delay;
+	session->unlock_delay_ms = (unsigned short) delay;
 }
+
+LIB3270_EXPORT int lib3270_get_unlock_delay(H3270 *session)
+{
+	CHECK_SESSION_HANDLE(session);
+	return (int) session->unlock_delay_ms;
+
+}
+
diff --git a/src/lib3270/properties.c b/src/lib3270/properties.c
index d612d14..4edbd87 100644
--- a/src/lib3270/properties.c
+++ b/src/lib3270/properties.c
@@ -129,10 +129,10 @@
 		},
 
 		{
-			"e",							//  Property name.
-			N_( "" ),						//  Property description.
-			lib3270_in_e,					//  Get value.
-			NULL							//  Set value.
+			"e",																				//  Property name.
+			N_( "Is terminal in the INITIAL_E state?" ),										//  Property description.
+			lib3270_in_e,																		//  Get value.
+			NULL																				//  Set value.
 		},
 
 		{
@@ -224,6 +224,12 @@
 			NULL										//  Set value.
 		},
 
+		{
+			"unlock_delay",																			//  Property name.
+			N_( "The delay between the host unlocking the keyboard and the actual unlock" ),		//  Property description.
+			lib3270_get_unlock_delay,																//  Get value.
+			lib3270_set_unlock_delay																//  Set value.
+		},
 
 		/*
 		{
--
libgit2 0.21.2