diff --git a/src/lib3270/host.c b/src/lib3270/host.c
index 8b94c24..464897d 100644
--- a/src/lib3270/host.c
+++ b/src/lib3270/host.c
@@ -54,6 +54,7 @@
 
 #include <errno.h>
 #include <lib3270/internals.h>
+#include <lib3270/properties.h>
 
 #define RECONNECT_MS		2000	/* 2 sec before reconnecting to host */
 #define RECONNECT_ERR_MS	5000	/* 5 sec before reconnecting to host */
@@ -331,7 +332,7 @@ LIB3270_EXPORT int lib3270_set_url(H3270 *h, const char *n)
 				{
 					*(val++) = 0;
 
-					if(lib3270_set_string_property(h, var, val, 0))
+					if(lib3270_set_string_property(h, var, val, 0) == 0)
 					{
 						continue;
 					}
diff --git a/src/lib3270/properties.c b/src/lib3270/properties.c
index 68afdfe..1de2625 100644
--- a/src/lib3270/properties.c
+++ b/src/lib3270/properties.c
@@ -277,6 +277,20 @@
 			lib3270_set_host_type						//  Set value.
 		},
 
+		{
+			"host_charset",								//  Property name.
+			N_( "" ),									//  Property description.
+			lib3270_get_host_charset,					//  Get value.
+			lib3270_set_host_charset					//  Set value.
+		},
+
+		{
+			"display_charset",							//  Property name.
+			N_( "" ),									//  Property description.
+			lib3270_get_display_charset,				//  Get value.
+			NULL										//  Set value.
+		},
+
 		/*
 		{
 			"",											//  Property name.
--
libgit2 0.21.2