diff --git a/THANKS b/THANKS
index 7c475dc7f..ef7480b9b 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Bug reports and fixes from:
    Christian Lynbech
         Russ McManus
 	Eric Moore
+	Brad Knotwell
      Nicolas Neuss
    Thien-Thi Nguyen
   James Dean Palmer
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 8d5957f5f..a34db47ea 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-18  Gary Houston  <ghouston@easynet.co.uk>
+
+	* fports.c (fport_write): use memcpy instead of strncpy, in case
+	the data contains NUL.
+
 1999-08-17  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
 	* gh.h (gh_vector_to_list): Bugfix.  (Thanks to Frank Cieslok.)
diff --git a/libguile/fports.c b/libguile/fports.c
index 1111338a8..86477cc27 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -481,7 +481,7 @@ fport_write (SCM port, void *data, size_t size)
 	  int space = pt->write_end - pt->write_pos;
 	  int write_len = (size > space) ? space : size;
 
-	  strncpy (pt->write_pos, input, write_len);
+	  memcpy (pt->write_pos, input, write_len);
 	  pt->write_pos += write_len;
 	  size -= write_len;
 	  input += write_len;