diff --git a/ChangeLog b/ChangeLog
index c6c8b91eb545ff112523470a21625e187276923e_Q2hhbmdlTG9n..b4032235969093cf444234e559f8b0a53ab06a82_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1998-04-05  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
+
+	* eudc: Released 1.03
+
+	* eudc.texi: Added @direntry section
+
+	* eudc.el: Guarded autoload menu addition for XEmacs.
+	Added (require 'cl) for Emacs.
+
+	* eudc-ldap.el: Removed dependency on `replace-in-string'
+
 1998-03-24  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
 
 	* eudc: Released 1.02
diff --git a/Makefile b/Makefile
index c6c8b91eb545ff112523470a21625e187276923e_TWFrZWZpbGU=..b4032235969093cf444234e559f8b0a53ab06a82_TWFrZWZpbGU= 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.02
-AUTHOR_VERSION = 1.02
+VERSION = 1.03
+AUTHOR_VERSION = 1.03
 MAINTAINER = Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>
 PACKAGE = eudc
 PKG_TYPE = regular
diff --git a/eudc-ldap.el b/eudc-ldap.el
index c6c8b91eb545ff112523470a21625e187276923e_ZXVkYy1sZGFwLmVs..b4032235969093cf444234e559f8b0a53ab06a82_ZXVkYy1sZGFwLmVs 100644
--- a/eudc-ldap.el
+++ b/eudc-ldap.el
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>
 ;; Created: Feb 1998
-;; Version: $Revision$
+;; Version: 1.5
 ;; Keywords: help
 
 ;; This file is part of XEmacs
@@ -99,6 +99,15 @@
 EUDC-VAR is the name of a EUDC variable and LDAP-VAR is 
 the corresponding LDAP-specific variable.")
 
+(defun eudc-filter-$ (string)
+  (let ((res ""))
+    (while (string-match " \\$ " string)
+      (setq res (concat res 
+			(substring string 0 (match-beginning 0))
+			"\n"))
+      (setq string (substring string (match-end 0))))
+    (setq res (concat res string))))
+
 (defun eudc-ldap-cleanup-record-field (field)
   "Do some cleanup in a record field to make it suitable for EUDC."
   ;; Make the field a cons-cell if it's single-valued
@@ -106,7 +115,7 @@
   (if (null (cdr (cdr field)))
       (cons (intern (car field)) 
 	    ;; Convert separators to newlines
-	    (replace-in-string (car (cdr field)) " \\$ " "\n"))
+	    (eudc-filter-$ (car (cdr field))))
     ;; Make the field name a symbol
     (cons (intern (car field)) (cdr field))))
 
diff --git a/eudc.el b/eudc.el
index c6c8b91eb545ff112523470a21625e187276923e_ZXVkYy5lbA==..b4032235969093cf444234e559f8b0a53ab06a82_ZXVkYy5lbA== 100644
--- a/eudc.el
+++ b/eudc.el
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>
 ;; Created: Feb 1998
-;; Version: $Revision$
+;; Version: 1.13
 ;; Keywords: help
 
 ;; This file is part of XEmacs
@@ -36,7 +36,7 @@
 
 ;;; Installation:
 
-;;    This library runs under XEmacs 20 and under Emacs 19.34 and above
+;;    This library is compatible with XEmacs 20 and under Emacs 19.34 and above
 
 ;;; Usage:
 
@@ -46,7 +46,9 @@
 
 (eval-and-compile
   (if (not (fboundp 'make-overlay))
-      (require 'overlay)))
+      (require 'overlay))
+  (if (not (fboundp 'unless))
+      (require 'cl)))
 
 (autoload 'custom-menu-create "cus-edit")
 (autoload 'bbdb-create-internal "bbdb-com")
@@ -1176,17 +1178,18 @@
   nil)
 
 ;;;###autoload
-(unless (featurep 'eudc)
-  (add-submenu '("Tools")
-	       '("Directory"
-		 ["Load Hotlist of Servers" eudc-load-eudc t]
-		 ["New Server" eudc-set-server t]
-		 ["---" nil nil]
-		 ["Query with Form" eudc-query-form t]
-		 ["Expand Inline Query" eudc-expand-inline t]
-		 ["---" nil nil]
-		 ["Get Email" eudc-get-email t]
-		 ["Get Phone" eudc-get-phone t])))
+(if (and (string-match "XEmacs" emacs-version)
+	 (not (featurep 'eudc)))
+    (add-submenu '("Tools")
+		 '("Directory"
+		   ["Load Hotlist of Servers" eudc-load-eudc t]
+		   ["New Server" eudc-set-server t]
+		   ["---" nil nil]
+		   ["Query with Form" eudc-query-form t]
+		   ["Expand Inline Query" eudc-expand-inline t]
+		   ["---" nil nil]
+		   ["Get Email" eudc-get-email t]
+		   ["Get Phone" eudc-get-phone t])))
         
 ;;}}}
 
diff --git a/eudc.texi b/eudc.texi
index c6c8b91eb545ff112523470a21625e187276923e_ZXVkYy50ZXhp..b4032235969093cf444234e559f8b0a53ab06a82_ZXVkYy50ZXhp 100644
--- a/eudc.texi
+++ b/eudc.texi
@@ -1,7 +1,7 @@
 \input texinfo.tex
 @c %**start of header
 @setfilename eudc.info
-@settitle eudc.el Manual
+@settitle Emacs Unified Directory Client (EUDC) Manual
 @iftex
 @afourpaper
 @end iftex
@@ -10,5 +10,7 @@
 @footnotestyle end
 
 @ifinfo
-This file documents eudc.el v1.02
+@direntry
+*eudc::   A client for directory servers (LDAP, PH)
+@end direntry
 
@@ -14,3 +16,3 @@
 
-eudc.el is part of XEmacs.
+This file documents EUDC v1.02
 
@@ -16,5 +18,7 @@
 
-eudc.el is is the Emacs Unified Directory Client, a common interface
+EUDC is part of XEmacs.
+
+EUDC is the Emacs Unified Directory Client, a common interface
 interface to directory servers using various protocols such as LDAP or
 the CCSO white pages directory system (PH/QI)
 
@@ -47,7 +51,7 @@
 @end ifinfo
 
 @titlepage
-@title{eudc Manual}
+@title{EUDC Manual}
 @subtitle{The Emacs Unified Directory Client}
 @author by Oscar Figueiredo
 @code{1.0}
@@ -88,8 +92,7 @@
 @comment  node-name,  next,         previous, up
 
 
-This manual documents eudc v1.02, the Emacs Unified Directory Client
-
+This manual documents EUDC v1.02, the Emacs Unified Directory Client
 A common interface interface to directory servers using various
 protocols such as LDAP or the CCSO white pages directory system (PH/QI)