diff --git a/README.multi-tty b/README.multi-tty
index 87faeb32e4d..0c1e4eb2739 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -182,6 +182,7 @@ to the project by testing, bug reports, and suggestions.  Thanks!
 Robert J. Chassell <bob at rattlesnake dot com>
 Romain Francoise <romain at orebokech dot com>
 Ami Fischman <ami at fischman dot org>
+Friedrich Delgado Friedrichs <friedel at nomaden dot org>
 Istvan Marko <mi-mtty ar kismala dot com>
 Dan Nicolaescu <dann at ics dot uci dot edu>
 Gergely Nagy <algernon at debian dot org>
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36b9904f4f1..bb00fe8fbbb 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -163,6 +163,7 @@
       (load "vmsproc")))
 (load "abbrev")
 (load "buff-menu")
+(load "server") ; server-getenv is used throughout the terminal initialization code
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
diff --git a/lisp/server.el b/lisp/server.el
index 57d4b7600b8..7156b7322e3 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -8,6 +8,7 @@
 ;; Keywords: processes
 
 ;; Changes by peck@sun.com and by rms.
+;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support.
 
 ;; This file is part of GNU Emacs.
 
@@ -872,7 +873,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
 
 (global-set-key "\C-x#" 'server-edit)
 
-(defsubst server-getenv (variable &optional frame)
+;;;###autoload
+(defun server-getenv (variable &optional frame)
   "Get the value of VARIABLE in the client environment of frame FRAME.
 VARIABLE should be a string.  Value is nil if VARIABLE is undefined in
 the environment.  Otherwise, value is a string.
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 063e63e1759..a398f63a925 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1017,6 +1017,7 @@ LispSource = 
 	{Lisp}international:codepage.elc ¶
 	{Lisp}abbrev.elc ¶
 	{Lisp}buff-menu.elc ¶
+	{Lisp}server.elc ¶
 	{Lisp}byte-run.elc ¶
 	{Lisp}cus-start.el ¶
 	{Lisp}custom.elc ¶
diff --git a/src/Makefile.in b/src/Makefile.in
index 30dbc9df0cf..15cc8003e59 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -699,6 +699,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 lisp= \
 	${lispsource}abbrev.elc \
 	${lispsource}buff-menu.elc \
+	${lispsource}server.elc \
 	${lispsource}button.elc \
 	${lispsource}emacs-lisp/byte-run.elc \
 	${lispsource}cus-face.elc \
@@ -791,6 +792,7 @@ lisp= \
 shortlisp= \
 	../lisp/abbrev.elc \
 	../lisp/buff-menu.elc \
+	../lisp/server.elc \
 	../lisp/button.elc \
 	../lisp/emacs-lisp/byte-run.elc \
 	../lisp/cus-face.elc \