diff --git a/FAQ/i4lfaq.sgml b/FAQ/i4lfaq.sgml
index e04bd080..e23acc28 100644
--- a/FAQ/i4lfaq.sgml
+++ b/FAQ/i4lfaq.sgml
@@ -5062,7 +5062,7 @@ ipppd. Please note these hints from NOTES.IPPPD:
   ie: 'callback 0'       -> simple callback (info via auth. etc.)
       'callback 3,12346' -> us E.164 (tel) number 123456 for callback
       'callback 6' is different. This value means, that the whole negotiation
-  is done with a separate protocol after the authentification phase. Currently
+  is done with a separate protocol after the authentication phase. Currently
   it's not possible to set any options in this case. The ipppd accepts
   everything from the remote side.
 </verb>
diff --git a/eurofile/CHANGES b/eurofile/CHANGES
index 449bbdb2..698af091 100644
--- a/eurofile/CHANGES
+++ b/eurofile/CHANGES
@@ -51,7 +51,7 @@ glibc2 compatibility and misc other cleanups
 
 - [chg] src/eft* #include <stdlib.h> where needed for realpath()
 	(for glibc2 support)
-- [imp] added paranoia check in eftd.c authentification handling.
+- [imp] added paranoia check in eftd.c authentication handling.
 - [imp] wuauth/{main,access,acl}.c: reject login if access file is required
 	but opening or reading fails
 - [imp] wuauth/{*.c,config.h}: changed ordering of #include's and added
@@ -218,8 +218,8 @@ integrated changes provided by ms@msdatec.de
   - [new] eftd.c, option '-h/-?' 
   - [new] eftd.c, eft_check_user(), main(), show_help()
     user mapping (option -n)
-    if authentification fails and "eft_map_to_user" is not null, 
-	"eft_map_to_user" is tried for authentification (a password isn't
+    if authentication fails and "eft_map_to_user" is not null, 
+	"eft_map_to_user" is tried for authentication (a password isn't
 	supported yet)
   - [imp] eft_dir, eft_store_slist()
           hardcoded ".++eft_flat" replaced by eft_flat_dir_name
diff --git a/eurofile/README b/eurofile/README
index 87e2bcf8..292e41dd 100644
--- a/eurofile/README
+++ b/eurofile/README
@@ -41,11 +41,11 @@ on top of this library:
 
 - An EUROFILE server which can serve multiple connections
   simulatneously and supports navigation (i.e. changing directories).
-  User authentification is provided by a separate
-  authentification library derived from wu-ftpd which allows for fine
+  User authentication is provided by a separate
+  authentication library derived from wu-ftpd which allows for fine
   grained access control based on user-id, password, and remote isdn
   phone number. The design allows for easily exchanging the
-  authentification routines by user-supplied versions.
+  authentication routines by user-supplied versions.
 
 This is all still alpha test software.
 That means it does certain tasks well at my site, but I know that
@@ -284,7 +284,7 @@ EUROfile project and I'd like to mention them explicitly:
 
  Point of Presence GmbH provided ftp server space.
 
- Georg v.Zezschwitz adapted the authentification code from the wu-ftpd
+ Georg v.Zezschwitz adapted the authentication code from the wu-ftpd
  which is now used inside the eft server.
 
  Martin Maurer provided protocol traces in the initial phase of development.
diff --git a/eurofile/TODO b/eurofile/TODO
index 81dcf37c..754265c7 100644
--- a/eurofile/TODO
+++ b/eurofile/TODO
@@ -93,7 +93,7 @@ if anybody is interested:
 	  GUI file managers) or write an eft-http gateway by means
           of the eftp4linux core library.
 
-   Support other authentification methods (PAM comes to mind) 
+   Support other authentication methods (PAM comes to mind) 
 
 
    And the "to do" list is incomplete as well.
diff --git a/eurofile/configure b/eurofile/configure
index 17e66843..a7183768 100755
--- a/eurofile/configure
+++ b/eurofile/configure
@@ -1199,7 +1199,7 @@ fi
 # Default config options to be applied when configuring stand-alone
 #
 CONFIG_EFTD=${CONFIG_EFTD:-y}
-# Shall eurofile daemon use authentification modules from wu-ftpd?
+# Shall eurofile daemon use authentication modules from wu-ftpd?
 CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-y}
 CONFIG_EFTP=${CONFIG_EFTP:-y}
 # This will be redefined to "n" by the configure script if no readline
diff --git a/eurofile/configure.in b/eurofile/configure.in
index 6722cd42..b07f5eae 100644
--- a/eurofile/configure.in
+++ b/eurofile/configure.in
@@ -27,7 +27,7 @@ fi
 # Default config options to be applied when configuring stand-alone
 #
 CONFIG_EFTD=${CONFIG_EFTD:-y}
-# Shall eurofile daemon use authentification modules from wu-ftpd?
+# Shall eurofile daemon use authentication modules from wu-ftpd?
 CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-y}
 CONFIG_EFTP=${CONFIG_EFTP:-y}
 # This will be redefined to "n" by the configure script if no readline
diff --git a/eurofile/doc/eftd b/eurofile/doc/eftd
index 5fcb59ed..cbbce649 100644
--- a/eurofile/doc/eftd
+++ b/eurofile/doc/eftd
@@ -134,7 +134,7 @@ OPTIONS
 		limits might be imposed by the mumber of physically
 		available isdn B-channels, the number of running
 		incoming isdn network interfaces configured with
-		"encap x25iface", or by the authentification procedure
+		"encap x25iface", or by the authentication procedure
 		(i.e. group limits configured in /etc/isdn/eftaccess).
 	
 		When multi mode is activated, the server forks an
diff --git a/eurofile/src/eft/eft_server.c b/eurofile/src/eft/eft_server.c
index 658a83dc..fbead21d 100644
--- a/eurofile/src/eft/eft_server.c
+++ b/eurofile/src/eft/eft_server.c
@@ -110,7 +110,7 @@ static int assoc_ind( struct tdu_user *usr, struct tdu_param *par)
 		 * passwd database.
 		 *
 		 * FIXME:
-		 * This check might be inappropriate if other authentification
+		 * This check might be inappropriate if other authentication
 		 * methods (not based on /etc/passwd) are used.
 		 */
 		
@@ -126,7 +126,7 @@ static int assoc_ind( struct tdu_user *usr, struct tdu_param *par)
 			
 			if( ! pw ){
 				/* user is unknown (not in /etc/passwd).*/
-				tdu_printf(TDU_LOG_LOG, "user %s not known, trying alternate authentification as user \"%s\" instead\n",
+				tdu_printf(TDU_LOG_LOG, "user %s not known, trying alternate authentication as user \"%s\" instead\n",
 					   user, eft_map_to_user);
 				user = eft_map_to_user;
 				pass = "";
diff --git a/eurofile/src/eftd/Makefile b/eurofile/src/eftd/Makefile
index cce05f0f..6f79964f 100644
--- a/eurofile/src/eftd/Makefile
+++ b/eurofile/src/eftd/Makefile
@@ -33,7 +33,7 @@ AUTH_LIB = -lwuauth
 ifdef EFT_AUTHDIR
 EFT_LIBDIR_FLAGS += -L $(EFT_AUTHDIR) 
 eftd: $(EFT_AUTHDIR)/libwuauth.a 
-# there is no header file for interfacing the authentification library yet
+# there is no header file for interfacing the authentication library yet
 endif
 endif
 
diff --git a/eurofile/src/eftd/eftd.c b/eurofile/src/eftd/eftd.c
index 76a883a4..7aa1ddfc 100644
--- a/eurofile/src/eftd/eftd.c
+++ b/eurofile/src/eftd/eftd.c
@@ -109,11 +109,11 @@ static int eft_check_user( struct eft *eft, char* user, char* pass, char *isdn_n
 	verified = wuftp_check_user(user, pass, isdn_no);
 	printf("user check: ruid=%d, euid=%d\n",getuid(),geteuid());
 	/* 
-	 * Be paranoid about buggy authentification functions that claim
+	 * Be paranoid about buggy authentication functions that claim
 	 * success but are still running with super user priviliges.
 	 */
 	if (verified && !geteuid()){
-		tdu_printf(TDU_LOG_ERR, "eftd: BUG in authentification procedure.\n (claims success, but process runs still with root priviliges).\nRejecting login for security reasons.\n");
+		tdu_printf(TDU_LOG_ERR, "eftd: BUG in authentication procedure.\n (claims success, but process runs still with root priviliges).\nRejecting login for security reasons.\n");
 		verified=0;
 	}
 
diff --git a/ipppd/NOTES.IPPPD b/ipppd/NOTES.IPPPD
index 73224274..438e1432 100644
--- a/ipppd/NOTES.IPPPD
+++ b/ipppd/NOTES.IPPPD
@@ -44,7 +44,7 @@ CHANGELOG:
    ie: 'callback 0'       -> simple callback (info via auth. etc.)
        'callback 3,12346' -> us E.164 (tel) number 123456 for callback
        'callback 6' is different. This value means, that the whole negotiation
-   is done with a separate protocol after the authentification phase. Currently
+   is done with a separate protocol after the authentication phase. Currently
    it's not possible to set any options in this case. The ipppd accepts
    everything from the remote side.
  - IPX and MS_DNS are now compiled into the binary without additional option
diff --git a/ipppd/auth.c b/ipppd/auth.c
index 7f7d82a2..3e94e785 100644
--- a/ipppd/auth.c
+++ b/ipppd/auth.c
@@ -347,7 +347,7 @@ static void network_phase(int linkunit)
 			  syslog(LOG_INFO,"ipppd[%d]: passed 2\n",linkunit);
 			case 0:
 			   /* 
-				* login check when peer has authentification
+				* login check when peer has authentication
 				*/
 			  if(go->neg_chap)
 			  {