diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed77983..a70162a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
   * Support of submodule, include and belongs-to.
   * Openconfig yang specs parsed: https://github.com/openconfig/public
   * Improved unknown handling
-  * `CLICON_YANG_DIR` is changed from a single directory to a path of directories
+  * Configure option `CLICON_YANG_DIR` is changed from a single directory to a path of directories
     * Note CLIXON_DATADIR (=/usr/local/share/clixon) need to be in the list
 
 ### API changes on existing features (you may need to change your code)
@@ -26,7 +26,10 @@
   * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
   * XML prolog syntax for 'well-formed' XML
   * <!DOCTYPE (ie DTD) is not supported.
+
 ### Corrected Bugs
+* getopt return value changed from char to int (https://github.com/clicon/clixon/issues/58)
+
 ### Known issues
 
 ## 3.8.0 (6 Nov 2018)
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 76a5dca9..db66647e 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -504,7 +504,7 @@ main(int    argc,
      char **argv)
 {
     int           retval = -1;
-    char          c;
+    int           c;
     int           zap;
     int           foreground;
     int           once;
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 5e887543..feb5f158 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -240,7 +240,7 @@ int
 main(int argc, char **argv)
 {
     int          retval = -1;
-    char         c;    
+    int          c;    
     int          once;
     char	*tmp;
     char	*argv0 = argv[0];
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 6326c283..aee1cf80 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -330,7 +330,7 @@ int
 main(int    argc,
      char **argv)
 {
-    char             c;
+    int              c;
     char            *tmp;
     char            *argv0 = argv[0];
     int              quiet = 0;
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index 5909e8db..76fe7aab 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -513,7 +513,7 @@ main(int    argc,
     char	 *argv0 = argv[0];
     FCGX_Request  request;
     FCGX_Request *r = &request;
-    char          c;
+    int           c;
     char         *sockpath;
     char         *path;
     clicon_handle h;
diff --git a/datastore/datastore_client.c b/datastore/datastore_client.c
index e5c5440c..165b4238 100644
--- a/datastore/datastore_client.c
+++ b/datastore/datastore_client.c
@@ -107,7 +107,7 @@ usage(char *argv0)
 int
 main(int argc, char **argv)
 {
-    char                c;
+    int                 c;
     clicon_handle       h;
     char               *argv0;
     char               *db = "running";
diff --git a/example/example_restconf.c b/example/example_restconf.c
index 6cc6323d..b7d55505 100644
--- a/example/example_restconf.c
+++ b/example/example_restconf.c
@@ -289,7 +289,7 @@ example_restconf_start(clicon_handle h,
 		       int           argc,
 		       char        **argv)
 {
-    char c;
+    int c;
 
     clicon_debug(1, "%s argc:%d", __FUNCTION__, argc);
     optind = 1;
diff --git a/lib/src/json_xpath.c b/lib/src/json_xpath.c
index 5ac6d152..9f7c5a54 100644
--- a/lib/src/json_xpath.c
+++ b/lib/src/json_xpath.c
@@ -28,7 +28,7 @@ usage(char *argv0)
 int
 main(int argc, char **argv)
 {
-    int i;
+    int         i;
     cxobj     **xv;
     cxobj      *x;
     cxobj      *xn;
@@ -42,7 +42,7 @@ main(int argc, char **argv)
     char       *buf;
     char       *p;
     int         retval;
-    char        c;
+    int         c;
 
     while ((c = getopt(argc, argv, "?hbj")) != -1)
       switch (c) {
diff --git a/util/clixon_util_stream.c b/util/clixon_util_stream.c
index 10275ecf..6f45de57 100644
--- a/util/clixon_util_stream.c
+++ b/util/clixon_util_stream.c
@@ -218,7 +218,7 @@ main(int argc, char **argv)
     int    timeout = 10;
     char   start[27] = {0,}; /* strlen = 0 */
     char   stop[27] = {0,};
-    char   c;
+    int    c;
     char  *argv0 = argv[0];
     struct timeval now;
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 5938eacb..88d2ab53 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -85,7 +85,7 @@ main(int    argc,
     cxobj *xc;
     cbuf  *cb = cbuf_new();
     int   retval = -1;
-    char  c;
+    int   c;
     int   logdst = CLICON_LOG_STDERR;
 
     optind = 1;
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index dcbee236..81b33361 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -119,7 +119,7 @@ main(int argc, char **argv)
     cxobj     **xv = NULL;
     cxobj      *x0 = NULL;
     cxobj      *x;
-    char        c;
+    int         c;
     int         len;
     char       *buf = NULL;
     int         ret;
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 13b78743..3615fd27 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -81,8 +81,8 @@ int
 main(int argc, char **argv)
 {
     yang_spec *yspec = NULL;
-    char      c;
-    int       logdst = CLICON_LOG_STDERR;
+    int        c;
+    int        logdst = CLICON_LOG_STDERR;
     
     optind = 1;
     opterr = 0;