diff --git a/ChangeLog b/ChangeLog
index e94f763a4e..6925f97729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+1998-03-30 17:20  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makerules: Remove duplicate rules to handle stamp.oS.
+
+1998-03-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* manual/examples/inetsrv.c (main): Change prototype of
+	make_socket following change in mkisock.c.
+
+	* manual/examples/inetcli.c (SERVERHOST): Use mescaline.gnu.org as
+	example host.
+	(main): Change prototype of init_sockaddr following change in
+	isockadd.c.
+
+	* manual/examples/mkisock.c (make_socket): Use uint16_t for port.
+	* manual/examples/isockad.c (init_sockaddr): Likewise.
+
+	* manual/examples/mkfsock.c (make_named_socket): Removed blank
+	lines for clarification.
+	(make_named_socket): Use strncpy instead of strcpy.
+	Reported by Francesco Potorti` <F.Potorti@cnuce.cnr.it>.
+
 1998-03-30 13:28  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Makefile (parent-mostlyclean): Use object-suffixes-for-libc for
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 671b69032c..fe9b664a15 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,7 +1,3 @@
-1998-03-30 17:20  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makerules: Remove duplicate rules to handle stamp.oS.
-
 1998-03-30  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Makefile: Fix test rules from last patch.
diff --git a/manual/examples/inetcli.c b/manual/examples/inetcli.c
index 258c6892aa..35dfb379e8 100644
--- a/manual/examples/inetcli.c
+++ b/manual/examples/inetcli.c
@@ -9,7 +9,7 @@
 
 #define PORT		5555
 #define MESSAGE		"Yow!!! Are we having fun yet?!?"
-#define SERVERHOST 	"churchy.gnu.ai.mit.edu"
+#define SERVERHOST 	"mescaline.gnu.org"
 
 void 
 write_to_server (int filedes)
@@ -30,7 +30,7 @@ main (void)
 {
   extern void init_sockaddr (struct sockaddr_in *name,
 			     const char *hostname,
-			     unsigned short int port);
+			     uint16_t port);
   int sock;
   struct sockaddr_in servername;
 
diff --git a/manual/examples/inetsrv.c b/manual/examples/inetsrv.c
index bd86e80f36..3d544c005c 100644
--- a/manual/examples/inetsrv.c
+++ b/manual/examples/inetsrv.c
@@ -37,7 +37,7 @@ read_from_client (int filedes)
 int
 main (void)
 {
-  extern int make_socket (unsigned short int port);
+  extern int make_socket (uint16_t port);
   int sock;
   fd_set active_fd_set, read_fd_set;
   int i;
diff --git a/manual/examples/isockad.c b/manual/examples/isockad.c
index 54ec1cca4c..9c21149a85 100644
--- a/manual/examples/isockad.c
+++ b/manual/examples/isockad.c
@@ -7,7 +7,7 @@
 void 
 init_sockaddr (struct sockaddr_in *name,
 	       const char *hostname,
-	       unsigned short int port)
+	       uint16_t port)
 {
   struct hostent *hostinfo;
 
diff --git a/manual/examples/mkfsock.c b/manual/examples/mkfsock.c
index d3750ec150..46729d13f0 100644
--- a/manual/examples/mkfsock.c
+++ b/manual/examples/mkfsock.c
@@ -13,7 +13,6 @@ make_named_socket (const char *filename)
   size_t size;
 
   /* Create the socket.  */
-  
   sock = socket (PF_UNIX, SOCK_DGRAM, 0);
   if (sock < 0)
     {
@@ -22,14 +21,16 @@ make_named_socket (const char *filename)
     }
 
   /* Bind a name to the socket.  */
-
   name.sun_family = AF_FILE;
-  strcpy (name.sun_path, filename);
+  strncpy (name.sun_path, filename, sizeof (name.sun_path));
 
   /* The size of the address is
      the offset of the start of the filename,
      plus its length,
-     plus one for the terminating null byte.  */
+     plus one for the terminating null byte.
+     Alternativly you can just do:
+     size = SUN_LEN (&name);
+  */
   size = (offsetof (struct sockaddr_un, sun_path)
 	  + strlen (name.sun_path) + 1);
 
diff --git a/manual/examples/mkisock.c b/manual/examples/mkisock.c
index 07411bb263..2fd8b3d2f9 100644
--- a/manual/examples/mkisock.c
+++ b/manual/examples/mkisock.c
@@ -4,7 +4,7 @@
 #include <netinet/in.h>
 
 int 
-make_socket (unsigned short int port)
+make_socket (uint16_t port)
 {
   int sock;
   struct sockaddr_in name;