diff --git a/ChangeLog b/ChangeLog
index d1212e926..3f8b83374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-11  Alexey Shchepin  <alexey@process-one.net>
 
+	* src/tls/tls_drv.c: Fixed gcc signedness warnings
+	* src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise
+
 	* src/expat_erl.c: Removed R9B workaround
 
 2008-04-10  Christophe Romain <christophe.romain@process-one.net>
diff --git a/src/ejabberd_zlib/ejabberd_zlib_drv.c b/src/ejabberd_zlib/ejabberd_zlib_drv.c
index 33c1c7c12..abb3183c0 100644
--- a/src/ejabberd_zlib/ejabberd_zlib_drv.c
+++ b/src/ejabberd_zlib/ejabberd_zlib_drv.c
@@ -107,14 +107,14 @@ static int ejabberd_zlib_drv_control(ErlDrvData handle,
 	 b = driver_alloc_binary(size);
 	 b->orig_bytes[0] = 0;
 
-	 d->d_stream->next_in = buf;
+	 d->d_stream->next_in = (unsigned char *)buf;
 	 d->d_stream->avail_in = len;
 	 d->d_stream->avail_out = 0;
 	 err = Z_OK;
 
 	 while (err == Z_OK && d->d_stream->avail_out == 0)
 	 {
-	    d->d_stream->next_out = b->orig_bytes + rlen;
+	    d->d_stream->next_out = (unsigned char *)b->orig_bytes + rlen;
 	    d->d_stream->avail_out = BUF_SIZE;
 
 	    err = deflate(d->d_stream, Z_SYNC_FLUSH);
@@ -135,14 +135,14 @@ static int ejabberd_zlib_drv_control(ErlDrvData handle,
 	 b->orig_bytes[0] = 0;
 
 	 if (len > 0) {
-	    d->i_stream->next_in = buf;
+	    d->i_stream->next_in = (unsigned char *)buf;
 	    d->i_stream->avail_in = len;
 	    d->i_stream->avail_out = 0;
 	    err = Z_OK;
 
 	    while (err == Z_OK && d->i_stream->avail_out == 0)
 	    {
-	       d->i_stream->next_out = b->orig_bytes + rlen;
+	       d->i_stream->next_out = (unsigned char *)b->orig_bytes + rlen;
 	       d->i_stream->avail_out = BUF_SIZE;
 
 	       err = inflate(d->i_stream, Z_SYNC_FLUSH);
diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c
index 02f4a26a7..5e86e78f5 100644
--- a/src/tls/tls_drv.c
+++ b/src/tls/tls_drv.c
@@ -250,7 +250,7 @@ static int tls_drv_control(ErlDrvData handle,
 	       rlen++;
 	       b = driver_alloc_binary(rlen);
 	       b->orig_bytes[0] = 0;
-	       tmp_buf = &b->orig_bytes[1];
+	       tmp_buf = (unsigned char *)&b->orig_bytes[1];
 	       i2d_X509(cert, &tmp_buf);
 	       X509_free(cert);
 	       *rbuf = (char *)b;