diff --git a/src/etc/etc.alpha/login.conf b/src/etc/etc.alpha/login.conf
index 9b77636f..07d1515b 100644
--- a/src/etc/etc.alpha/login.conf
+++ b/src/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:18 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.amd64/login.conf b/src/etc/etc.amd64/login.conf
index d20803f9..09744f34 100644
--- a/src/etc/etc.amd64/login.conf
+++ b/src/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/07/20 18:53:18 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2015/10/23 22:55:49 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.armish/login.conf b/src/etc/etc.armish/login.conf
index 9b77636f..07d1515b 100644
--- a/src/etc/etc.armish/login.conf
+++ b/src/etc/etc.armish/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:18 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.armv7/login.conf b/src/etc/etc.armv7/login.conf
index 9b77636f..07d1515b 100644
--- a/src/etc/etc.armv7/login.conf
+++ b/src/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:18 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.aviion/login.conf b/src/etc/etc.aviion/login.conf
index bd83586c..07d1515b 100644
--- a/src/etc/etc.aviion/login.conf
+++ b/src/etc/etc.aviion/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.hppa/login.conf b/src/etc/etc.hppa/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.hppa/login.conf
+++ b/src/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.hppa64/login.conf b/src/etc/etc.hppa64/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.hppa64/login.conf
+++ b/src/etc/etc.hppa64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.i386/login.conf b/src/etc/etc.i386/login.conf
index e627c9ec..9c8372d7 100644
--- a/src/etc/etc.i386/login.conf
+++ b/src/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.landisk/login.conf b/src/etc/etc.landisk/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.landisk/login.conf
+++ b/src/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.loongson/login.conf b/src/etc/etc.loongson/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.loongson/login.conf
+++ b/src/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.luna88k/login.conf b/src/etc/etc.luna88k/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.luna88k/login.conf
+++ b/src/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.macppc/login.conf b/src/etc/etc.macppc/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.macppc/login.conf
+++ b/src/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.octeon/login.conf b/src/etc/etc.octeon/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.octeon/login.conf
+++ b/src/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.sgi/login.conf b/src/etc/etc.sgi/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.sgi/login.conf
+++ b/src/etc/etc.sgi/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.socppc/login.conf b/src/etc/etc.socppc/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.socppc/login.conf
+++ b/src/etc/etc.socppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.sparc/login.conf b/src/etc/etc.sparc/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.sparc/login.conf
+++ b/src/etc/etc.sparc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.sparc64/login.conf b/src/etc/etc.sparc64/login.conf
index e627c9ec..9c8372d7 100644
--- a/src/etc/etc.sparc64/login.conf
+++ b/src/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.vax/login.conf b/src/etc/etc.vax/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.vax/login.conf
+++ b/src/etc/etc.vax/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults:
 
diff --git a/src/etc/etc.zaurus/login.conf b/src/etc/etc.zaurus/login.conf
index bd83586c..0f98caeb 100644
--- a/src/etc/etc.zaurus/login.conf
+++ b/src/etc/etc.zaurus/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.4 2015/07/20 18:53:19 sthen Exp $
+# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -48,7 +48,6 @@ default:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
-	:ypcipher=old:\
 	:tc=auth-defaults:\
 	:tc=auth-ftp-defaults: