diff --git a/src/ChangeLog b/src/ChangeLog
index ef1db85ad7947f49f61962ede6e13cdd7eed7101..551ed1c9ae9bbdf47725f2de7efe96ec4ae698a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-15  David Byers  <davby@ida.liu.se>
+
+	* command.el (lyskom-command-complete-word): Prevent multiple
+	spaces at end of a word (you'd get them when you typed a full word
+	and then a space).
+	(lyskom-read-extended-command): Bind last-exact-completion for
+	XEmacs compatibility.
+	(last-exact-completion): New variable.
+
 2000-09-14  David Byers  <davby@sen2.ida.liu.se>
 
 	* Release av 0.46.1-BETA-2
diff --git a/src/Makefile b/src/Makefile
index 9fb42ae3755f0031175c1513b1f3e46e6c68cb1a..bb28eefd7ff9e055db915bf5d6b3861f15ade805 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,7 +44,7 @@ REDHATCLIENTVERSION = $(shell echo $(CLIENTVERSION) | tr - .)
 RPMROOT = /usr/src/redhat
 
 FTPDIR=/home/davby/www-pub
-REMOTEDIR=sanna.lysator.liu.se:/lysator/ftp/pub/lyskom/elisp-client
+#REMOTEDIR=sanna.lysator.liu.se:/lysator/ftp/pub/lyskom/elisp-client
 #FTPDIR = /usr/ftp/pub/lyskom/elisp-client
 LISPDIR = /usr/gnu/share/emacs/site-lisp
 LANGUAGES = swedish english
diff --git a/src/command.el b/src/command.el
index aa944eb5e5737e085f8e9e94b3d914b8323c70ed..88c4b058a612a1f520788c34aedd771974ed53fd 100644
--- a/src/command.el
+++ b/src/command.el
@@ -208,11 +208,14 @@
   (define-key lyskom-command-completion-map (kbd "SPC")
     'lyskom-command-complete-word))
 
+(defvar last-exact-completion)
+
 (defun lyskom-read-extended-command (&optional prefix-arg)
   "Reads and returns a command"
   (let* ((completion-ignore-case t)
 	 (minibuffer-setup-hook minibuffer-setup-hook)
 	 (name nil)
+         (last-exact-completion nil)
          (prefix-text
           (cond ((eq prefix-arg '-) "- ")
                 ((equal prefix-arg '(4)) "C-u ")
@@ -372,8 +375,9 @@ and back of the string."
     (cond ((null completion) (minibuffer-message " [No match]") nil)
 	  ((eq completion t) nil)
 	  (t (let* ((tmp (buffer-string)))
-	       (when (string-equal (lyskom-unicase completion)
-				   (lyskom-unicase tmp))
+	       (when (and (string-equal (lyskom-unicase completion)
+                                        (lyskom-unicase tmp))
+                          (not (string-match "\\s-$" completion)))
 		 (if (stringp (setq tmp (try-completion 
 					 (concat tmp " ")
 					 minibuffer-completion-table
diff --git a/src/distribution-Makefile.in b/src/distribution-Makefile.in
index 36ed365a51e09426a2aadd9e987fe93a12a6666f..b3b82ebd70bab4906034c78871f2227097b54f36 100644
--- a/src/distribution-Makefile.in
+++ b/src/distribution-Makefile.in
@@ -111,7 +111,7 @@ install: lyskom-@@CLIENTVERSION@@.elc
 	cp lyskom-@@CLIENTVERSION@@.el lyskom-@@CLIENTVERSION@@.elc $(LISPDIR)
 	rm -f $(LISPDIR)/lyskom.el
 	ln -s $(LISPDIR)/lyskom-@@CLIENTVERSION@@.el $(LISPDIR)/lyskom.el
-	rm -s $(LISPDIR)/lyskom.elc
+	rm -f $(LISPDIR)/lyskom.elc
 	ln -s $(LISPDIR)/lyskom-@@CLIENTVERSION@@.elc $(LISPDIR)/lyskom.elc
 
 clean: