diff --git a/.cvsignore b/.cvsignore
index a5af790809d82f4409380ad7f58e212bd9c4e358..e05f2d14f532910aae3d868d3972f60e8ffc4f21 100755
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,4 +14,5 @@ test-suite-reportxm.lisp
 update.log
 *.out
 *.zip
+*.tmp
 dist
diff --git a/ChangeLog.n b/ChangeLog.n
index 705c615e5d7d4087bdb2ad5cfaba725ec6af94c6..02e3a6170dbeb25362ad992b99b42912209c5286 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -10,6 +10,20 @@ If there are user-visible changes in this commit, then list the
 <standard changelog date stamp>
 	* <changes go here...>
 
+*******************************************************************************
+2.2.2.11
+
+2000-06-08  Kevin Layer  <layer@ultra>
+
+	* Makefile.defs: simplify LISP and DCL
+	* RELNOTES: added from Tim
+	* aclpc/acl-prel.lisp: fix from Tim (for the bug#)
+	* clim/stream-defprotocols.lisp,
+	* pre-silica/drawing-state-mixin.lisp: bug9018
+	* demo/sysdcl.lisp: fix from Tim
+	* misc/compile-1.lisp: fixes to allow this file to be compiled and
+	error reporting
+
 *******************************************************************************
 2.2.2.10 -- join from acl50 branch
 
diff --git a/Makefile.defs b/Makefile.defs
index 129a98cd0618ae068d9b510f5c3a1357a9453e3e..d04c63b70e34416a395000f3e6d7f266d0d2e2fe 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -1,4 +1,4 @@
-# $Id: Makefile.defs,v 1.51 2000/05/01 21:43:18 layer Exp $
+# $Id: Makefile.defs,v 1.52 2000/06/08 19:16:51 layer Exp $
 #
 #  Makefile.defs for CLIM 2.0
 
@@ -7,13 +7,8 @@ CLIM		= clim.dxl
 
 SHARED_EXT = so
 
-ifeq ($(OS_NAME),windows)
-LISP	= ../src/lisp$(exe)
-DCL	= dcl
-else
 LISP	= ../src/lispi$(exe)
 DCL	= dcli
-endif
 
 # Set the case mode when building and dumping an image
 # case_mode:
diff --git a/RELNOTES b/RELNOTES
index 70a3be1eef6da4c8cb94623698466c508c77e8b1..f6a3ff6666d7f3b6d6f9f00d9f36c9cb8463fac1 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -13,4 +13,26 @@ developers or documentation.
 
 ************* add new entries below this line *********************************
 
-1. [bug/rfe#] ...summary...
+1. rfe3925. CLIM now works in a case-sensitive Lisp.  CLIM now will
+   work in two flavours of Lisp: `traditional' ANSI Lisp -- standard
+   CL symbols are uppercase, the reader converts non-escaped symbols
+   to uppercase; `modern' Lisp -- standard CL symbols are lowercase,
+   and the reader does no case conversion.  In the former case, all
+   exported CLIM symbols are uppercase as before; in the latter they
+   are lowercase.
+
+2. spr21587. On Windows platforms, NOTIFY-USER now always raises the
+   dialog box it creates to the top of the window stack.  Formerly it
+   could be buried behind other windows if the CLIM application frame
+   was itself buried.
+
+3. bug8764.  Lisp will not prompt you to be sure you want to exit Lisp
+   if CLIM timers have been used.  Previously if exited Lisp it would
+   ask you to confirm that you wanted to do so if you'd ever used a
+   timer.
+
+4. <norfe>. For Unix/Linux the CLIM debug fasls (clim-debug.fasl,
+   clim-debugwnn.fasl and clim-debuxm.fasl) are empty.  The debugging
+   code is now included in the normal fasls and the empty files
+   included for backwards compatibility.  In a future release they
+   will disappear.
diff --git a/aclpc/acl-prel.lisp b/aclpc/acl-prel.lisp
index 52eaed72cd415d6af31ea2ea8917baf776128e40..8d3645d141b214ce51136657584468769ae1e8c7 100644
--- a/aclpc/acl-prel.lisp
+++ b/aclpc/acl-prel.lisp
@@ -15,7 +15,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: acl-prel.lisp,v 1.11 2000/05/01 21:43:20 layer Exp $
+;; $Id: acl-prel.lisp,v 1.12 2000/06/08 19:16:51 layer Exp $
 
 #|****************************************************************************
 *                                                                            *
@@ -348,16 +348,16 @@
 	       (setq rgb (medium-background medium))))
 	(multiple-value-bind (red green blue) (color-rgb rgb)
 	  (ct:cset windows:bitmapinfo bmi
-		   (windows::bmicolors (fixnum i) rgbreserved) 
+		   (windows::bmiColors (fixnum i) windows::rgbReserved) 
 		   0)
 	  (ct:cset windows:bitmapinfo bmi
-		   (windows::bmicolors (fixnum i) rgbred)
+		   (windows::bmiColors (fixnum i) windows::rgbRed)
 		   (floor (* 255 red)))
 	  (ct:cset windows:bitmapinfo bmi
-		   (windows::bmicolors (fixnum i) rgbblue)
+		   (windows::bmiColors (fixnum i) windows::rgbBlue)
 		   (floor (* 255 blue)))
 	  (ct:cset windows:bitmapinfo bmi
-		   (windows::bmicolors (fixnum i) rgbgreen)
+		   (windows::bmiColors (fixnum i) windows::rgbGreen)
 		   (floor (* 255 green))))))
     ;; return values
     (values bmi win:DIB_RGB_COLORS)))
diff --git a/clim/stream-defprotocols.lisp b/clim/stream-defprotocols.lisp
index 769e6f0cb2d2176441c41f7b56b5596fd1983255..e371c4709d46164f477bd92066dee084ab201f91 100644
--- a/clim/stream-defprotocols.lisp
+++ b/clim/stream-defprotocols.lisp
@@ -16,7 +16,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: stream-defprotocols.lisp,v 1.20 2000/05/01 21:43:26 layer Exp $
+;; $Id: stream-defprotocols.lisp,v 1.21 2000/06/08 19:16:52 layer Exp $
 
 (in-package :clim-internals)
 
@@ -345,7 +345,7 @@
   medium-ink
   medium-transformation
   medium-line-style
-  medium-+Y-upward-p)
+  medium-+y-upward-p)
 
 (defoperation invoke-with-drawing-options drawing-state-mixin
   ((stream drawing-state-mixin) function &rest options))
diff --git a/demo/sysdcl.lisp b/demo/sysdcl.lisp
index bf21f3e3957f92b3fe71ccd6540e5aab6051acbe..413995ff99cf8442920fb0b75ac74cddd3e394e6 100644
--- a/demo/sysdcl.lisp
+++ b/demo/sysdcl.lisp
@@ -16,7 +16,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: sysdcl.lisp,v 1.31 1999/02/25 08:23:31 layer Exp $
+;; $Id: sysdcl.lisp,v 1.32 2000/06/08 19:16:54 layer Exp $
 
 (in-package #-ansi-90 :user #+ansi-90 :common-lisp-user)
 
@@ -28,6 +28,8 @@
 (defsystem clim-demo
     (:default-pathname "clim2:;demo;")
   (:serial
+;;;   #+acl86win32 aclnt-clim
+   postscript-clim-stubs
    ("packages" (:module-class compile-always))
    ("demo-driver"     (:load-before-compile "packages"))
    ("listener"        (:load-before-compile "demo-driver" "packages"))
diff --git a/misc/compile-1.lisp b/misc/compile-1.lisp
index 27e38551b57d67bf06b8eb5ff005e7daad9ed42d..d9a5c22dc60394ca398b75ff2534f3d0ef627ace 100644
--- a/misc/compile-1.lisp
+++ b/misc/compile-1.lisp
@@ -17,12 +17,10 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: compile-1.lisp,v 1.37 2000/05/01 21:43:29 layer Exp $
+;; $Id: compile-1.lisp,v 1.38 2000/06/08 19:16:54 layer Exp $
 
 (in-package :user)
 
-(set-case-mode :case-insensitive-upper)
-
 ;;; This should not matter
 ;;; (setq *ignore-package-name-case* t)
 
@@ -33,6 +31,7 @@
 (eval-when (compile load eval) 
   (pushnew :acl86win32 *features*))
 
+#-(version>= 6 0)
 (setq comp:generate-call-count-code-switch
   (named-function |(> debug 1)|
 		  (lambda (safety size speed debug)
@@ -53,11 +52,11 @@
 	      (format nil 
 		      #+acl86win32 "~A**\\*.*" 
 		      #-acl86win32 "~A**/*.*"
-		      #.(directory-namestring 
-			 (make-pathname
-			  :directory
-			  (butlast (pathname-directory 
-				    *load-pathname*))))))))
+		      (directory-namestring 
+		       (make-pathname
+			:directory
+			(butlast (pathname-directory 
+				  *load-pathname*))))))))
 
 ;;;; system definitions we need
 ;;;
@@ -140,6 +139,10 @@
     ;; probably make this be just clim-demo + clim-tests.
     ()
   (:serial
+;;;   #+acl86win32
+;;;   "clim2:;aclpc;sysdcl"                ;get defsys for compile.  Ick.
+   #+acl86win32
+   "clim2:;aclpc;pkgdcl"                ;get package for compile.  Ick.
    clim-demo				;demo;sysdcl
    "clim2:;test;test-suite"             ;hack!
    ))
@@ -319,7 +322,7 @@
 		    (excl:tenuring
 		     (excl:load-system s))))
 		 ((not ignore-if-unknown)
-		  (error "System ~S not known" sys))
+		  (error "System ~S not known" s))
 		 (t nil))))
     (with-compilation-unit ()
       (cl sys)
@@ -329,7 +332,8 @@
       ;; the clim-homegrown and the clim-compatibility (from
       ;; compatibility;sysdcl) systems were not being bult on any
       ;; platform.
-      #+ics				;I hope this is the right test
+      #+(and allegro (not acl86win32))
+      ;;#+ics				;I hope this is the right test
       (cl 'wnn)
       (cl 'postscript-clim)
       (cl 'climdemo)
@@ -359,9 +363,9 @@
   (concatenate-system 'postscript-clim "clim2:;climps.fasl")
   ;; The wnn system depends on ics.  The debug system is just there
   ;; for backwards compatibility
-  #+ics
+  #+(and allegro (not acl86win32))
   (concatenate-system 'wnn-cat "clim2:;climwnn.fasl")
-  #+ics
+  #+(and allegro (not acl86win32))
   (concatenate-system 'empty-cat "clim2:;clim-debugwnn.fasl")
   ;; hpgl only on unix
   #-acl86win32
diff --git a/pre-silica/drawing-state-mixin.lisp b/pre-silica/drawing-state-mixin.lisp
index cc93c0faf0ad1f8e58c0b350fe2e380a0af94722..94a353adb3f057bc965b26b52f303a4628f529c2 100644
--- a/pre-silica/drawing-state-mixin.lisp
+++ b/pre-silica/drawing-state-mixin.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $Id: drawing-state-mixin.lisp,v 1.9 1998/08/06 23:16:51 layer Exp $
+;; $Id: drawing-state-mixin.lisp,v 1.10 2000/06/08 19:16:55 layer Exp $
 
 (in-package :clim-internals)
 
@@ -86,7 +86,7 @@
      (transformation :initform +identity-transformation+ :accessor medium-transformation)
      (transformed-clipping-region :initform +everywhere+)
      (line-style :initform +default-line-style+ :accessor medium-line-style)
-     (+Y-upward-p :initform nil :accessor medium-+Y-upward-p)))
+     (+y-upward-p :initform nil :accessor medium-+y-upward-p)))
 
 (defmethod medium-clipping-region ((medium drawing-state-mixin))
   (with-slots (transformation transformed-clipping-region) medium
diff --git a/utils/packages.lisp b/utils/packages.lisp
index d3e9bcec7f7333fa6d05d5b45115684f3b795f2d..ac8b58e9bce5fbdf85dc215bc4c3fd03a0a4868c 100644
--- a/utils/packages.lisp
+++ b/utils/packages.lisp
@@ -16,7 +16,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: packages.lisp,v 1.95 2000/05/01 21:43:39 layer Exp $
+;; $Id: packages.lisp,v 1.96 2000/06/08 19:16:56 layer Exp $
 
 (in-package :common-lisp-user)
 
@@ -3295,7 +3295,7 @@
 (cl:defvar *clim-major-version* 2)
 (cl:defvar *clim-minor-version* 2)
 (cl:defvar *clim-generation-version* 2)
-(cl:defvar *clim-build-version* 10)
+(cl:defvar *clim-build-version* 11)
 
 (cl:defparameter *clim-version*
     (cl:format () "~d.~d.~d.~a"