diff --git a/contrib/sockets/sockets.lisp b/contrib/sockets/sockets.lisp
index be71ed8e9..526d1d737 100644
--- a/contrib/sockets/sockets.lisp
+++ b/contrib/sockets/sockets.lisp
@@ -42,9 +42,7 @@
  "#include <netinet/in.h>"
  "#include <errno.h>"
  "#include <fcntl.h>"
- "#include <stdio.h>"
- #+:cygwin
- "#define MSG_WAITALL 0")
+ "#include <stdio.h>")
 #+:wsock
 (clines
  "#include <winsock2.h>"
@@ -1262,10 +1260,10 @@ GET-NAME-SERVICE-ERRNO")
 (define-sockopt socket-dont-route "SO_DONTROUTE" bool)
 (define-sockopt socket-linger "SO_LINGER" bool)
 
-#-(or :linux :wsock :cygwin)
+#-(or :linux :wsock)
 (define-sockopt sockopt-reuse-port "SO_REUSEPORT" bool)
 
 ;; Add sockopts here as you need them...
 
 ;; Finished loading
-(provide 'sockets)
+(provide 'sockets)
\ No newline at end of file
diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d
index fdcf35c17..cd307814c 100644
--- a/src/c/unixfsys.d
+++ b/src/c/unixfsys.d
@@ -758,6 +758,8 @@ si_mkdir(cl_object directory, cl_object mode)
 
 	filename = si_coerce_to_filename(directory);
 	modeint = fixnnint(mode);
+	if (filename->string.fillp)
+	    filename->string.self[--filename->string.fillp] = 0;
 #ifdef mingw32
 	if (mkdir(filename->string.self) < 0)
 #else
diff --git a/src/clx/manual/clx.texinfo b/src/clx/manual/clx.texinfo
index c04d51e76..cdd37ddd5 100644
--- a/src/clx/manual/clx.texinfo
+++ b/src/clx/manual/clx.texinfo
@@ -11,7 +11,13 @@
 * CLX: (clx).		Common LISP X Interface
 @end direntry
 
-@copying
+
+@titlepage
+@title The Common Lisp X Interface (CLX)
+
+@page
+@vskip 0pt plus 1filll
+@c @copying
 The Common LISP X Interface (CLX)
 
 Copyright @copyright{} 1988, 1989 Texas Instruments Incorporated
@@ -26,14 +32,7 @@ described herein for any purpose. It is provided "as is" without
 express or implied warranty.
 @end quotation
 
-@end copying
-
-@titlepage
-@title The Common Lisp X Interface (CLX)
-
-@page
-@vskip 0pt plus 1filll
-@insertcopying
+@c @end copying
 @end titlepage
 
 @contents
@@ -42,7 +41,22 @@ express or implied warranty.
 @node Top, Acknowledgments, (dir), (dir)
 @top The Common LISP X Interface (CLX)
 
-@insertcopying
+@c @copying
+The Common LISP X Interface (CLX)
+
+Copyright @copyright{} 1988, 1989 Texas Instruments Incorporated
+
+@quotation
+Permission is granted to any individual or institution to use, copy,
+modify and distribute this document, provided that this complete
+copyright and permission notice is maintained, intact, in all copies
+and supporting documentation. Texas Instruments Incorporated makes no
+representations about the suitability of this document or the software
+described herein for any purpose. It is provided "as is" without
+express or implied warranty.
+@end quotation
+
+@c @end copying
 @end ifnottex
 
 @menu
diff --git a/src/clx/xrender.lisp b/src/clx/xrender.lisp
index 7a790a170..184bf092f 100644
--- a/src/clx/xrender.lisp
+++ b/src/clx/xrender.lisp
@@ -869,7 +869,7 @@ by every function, which attempts to generate RENDER requests."
 
 
 ;; $Log$
-;; Revision 1.15  2005-05-19 11:27:30  jjgarcia
+;; Revision 1.16  2005-05-19 11:31:18  jjgarcia
 ;; NetBSD's mkdir does not like the trailing slash in a directory name
 ;;
 ;; Revision 1.1  2004/06/10 07:59:31  jlr
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 9b5d9986a..ddddd580f 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -299,9 +299,9 @@ static cl_object VV[VM];
        (unwind-protect
          (progn
            (with-open-file (f "static_lib.tmp" :direction :output :if-does-not-exist :create :if-exists :supersede)
-             (format f "/DEBUGTYPE:CV /OUT:~A ~A ~{\"~&~A\"~}"
+             (format f "/OUT:~A ~A ~{\"~&~A\"~}"
                      output-name o-name ld-flags))
-           (safe-system "lib @static_lib.tmp"))
+           (safe-system "link -lib -debug @static_lib.tmp"))
          (when (probe-file "static_lib.tmp")
            (cmp-delete-file "static_lib.tmp")))
        )
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 642f76ac8..9d507c54a 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -103,7 +103,7 @@ ecl.info: $(srcdir)/user.txi $(srcdir)/macros.txi
 ecldev.info: $(srcdir)/devel.txi $(srcdir)/macros.txi
 	makeinfo -I $(srcdir) --no-split $(srcdir)/devel.txi
 clx.info: clx.texinfo
-	makeinfo --no-split clx.texinfo
+	-makeinfo --no-split clx.texinfo
 clx.texinfo: $(top_srcdir)/clx/manual/clx.texinfo
 	cp $(top_srcdir)/clx/manual/clx.texinfo .