diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 9185087ea0e..0e7499236d6 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -3,13 +3,13 @@
 # Date created:		16 Nov 1997
 # Whom:			todd@OpenBSD.ORG
 #
-# $OpenBSD: Makefile,v 1.25 1998/07/07 03:59:57 marc Exp $
+# $OpenBSD: Makefile,v 1.26 1998/07/13 01:16:52 marc Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
 #
 
-DISTNAME=       ssh-1.2.25
+DISTNAME=       ssh-1.2.26
 CATEGORIES=	security net
 NO_CDROM=	"CRYPTO: Third party crypto not allowed."
 
@@ -29,9 +29,6 @@ MASTER_SITES=	\
 	ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
 	ftp://idea.dsi.unimi.it/pub/security/crypt/math/
 .endif
-PATCH_SITES=		http://www.core-sdi.com/ssh/
-PATCHFILES=		ssh-1.2.25.patch
-PATCH_DIST_STRIP=	-p1
 
 RESTRICTED=	"Crypto; export-controlled"
 IS_INTERACTIVE=	YES
diff --git a/security/ssh/files/md5 b/security/ssh/files/md5
index fe4170b8478..5143439c1e2 100644
--- a/security/ssh/files/md5
+++ b/security/ssh/files/md5
@@ -1,3 +1,2 @@
-MD5 (ssh-1.2.25.tar.gz) = f16c579f8d60d2f0eaabd3c30e46ca2c
+MD5 (ssh-1.2.26.tar.gz) = 2ee46d454015dd01c5e8f074eabf0245
 MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d
-MD5 (ssh-1.2.25.patch) = 57b2d84116642fd3135dc641045445df
diff --git a/security/ssh/patches/patch-aa b/security/ssh/patches/patch-aa
index ae0185f5e4e..0277560297f 100644
--- a/security/ssh/patches/patch-aa
+++ b/security/ssh/patches/patch-aa
@@ -1,6 +1,6 @@
---- make-ssh-known-hosts.pl.~1~	Mon May 11 15:34:43 1998
-+++ make-ssh-known-hosts.pl.in	Sun May 31 12:36:43 1998
-@@ -95,7 +95,7 @@
+--- make-ssh-known-hosts.pl.in.orig	Wed Jul  8 09:40:08 1998
++++ make-ssh-known-hosts.pl.in	Sun Jul 12 17:48:10 1998
+@@ -98,7 +98,7 @@
  $debug = 5;
  $defserver = '';
  $bell='\a';
diff --git a/security/ssh/patches/patch-ab b/security/ssh/patches/patch-ab
index 2c97a1ca7b7..fe9967a8939 100644
--- a/security/ssh/patches/patch-ab
+++ b/security/ssh/patches/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jun 11 07:01:48 1998
-+++ configure	Thu Jun 11 19:52:41 1998
-@@ -1911,13 +1911,6 @@
+--- configure.orig	Wed Jul  8 09:41:14 1998
++++ configure	Sun Jul 12 17:48:11 1998
+@@ -1996,13 +1996,6 @@
  
  export CFLAGS CC
  
@@ -12,9 +12,9 @@
 -
 -
  echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
- echo "configure:1923: checking that the compiler works" >&5
+ echo "configure:2008: checking that the compiler works" >&5
  if test "$cross_compiling" = yes; then
-@@ -7435,7 +7428,7 @@
+@@ -7740,7 +7733,7 @@
  
  cat >> $CONFIG_STATUS <<EOF
  
@@ -23,7 +23,7 @@
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-@@ -7639,6 +7632,8 @@
+@@ -7944,6 +7937,8 @@
    done
  
    for ac_config_dir in gmp-2.0.2-ssh-2; do
diff --git a/security/ssh/patches/patch-ac b/security/ssh/patches/patch-ac
index 17abb713be1..f32e20e3e11 100644
--- a/security/ssh/patches/patch-ac
+++ b/security/ssh/patches/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jun 11 07:01:13 1998
-+++ Makefile.in	Thu Jun 11 19:52:41 1998
-@@ -287,12 +287,17 @@
+--- Makefile.in.orig	Wed Jul  8 09:40:39 1998
++++ Makefile.in	Sun Jul 12 17:48:12 1998
+@@ -294,12 +294,17 @@
  SHELL = /bin/sh
  
  GMPDIR 		= gmp-2.0.2-ssh-2
@@ -22,7 +22,7 @@
  
  RSAREFDIR	= rsaref2
  RSAREFSRCDIR 	= $(RSAREFDIR)/source
-@@ -397,7 +402,7 @@
+@@ -404,7 +409,7 @@
  	$(CC) -o rfc-pg rfc-pg.o
  
  .c.o:
@@ -31,7 +31,7 @@
  
  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
  	-rm -f sshd
-@@ -440,19 +445,19 @@
+@@ -447,19 +452,19 @@
  	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
  	chmod +x make-ssh-known-hosts
  
@@ -64,16 +64,16 @@
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
-@@ -509,7 +514,7 @@
+@@ -516,7 +521,7 @@
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
 -install: $(PROGRAMS) make-dirs generate-host-key install-configs
 +install: $(PROGRAMS) make-dirs install-configs
  	-rm -f $(install_prefix)$(bindir)/ssh1.old
- 	-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
- 	-chmod 755 $(install_prefix)$(bindir)/ssh1.old
-@@ -665,15 +670,15 @@
+ 	-chmod 755 $(install_prefix)$(bindir)/ssh1
+ 	-chmod 755 $(install_prefix)$(bindir)/ssh
+@@ -672,15 +677,15 @@
  
  clean:
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
@@ -91,9 +91,9 @@
 +#	cd $(GMPDIR); $(MAKE) distclean
 +#	cd $(ZLIBDIR); $(MAKE) distclean
  
- dist: dist-commercial
+ dist: dist-free
  
-@@ -702,12 +707,12 @@
+@@ -709,12 +714,12 @@
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
@@ -110,7 +110,7 @@
  
  #ifdef F_SECURE_COMMERCIAL
  #
-@@ -735,7 +740,7 @@
+@@ -742,7 +747,7 @@
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
  
  depend:
diff --git a/security/ssh/patches/patch-af b/security/ssh/patches/patch-af
index 348eacf087c..2ea2bc3f18a 100644
--- a/security/ssh/patches/patch-af
+++ b/security/ssh/patches/patch-af
@@ -1,11 +1,11 @@
---- sshd.8.in.orig	Thu Jun 11 07:00:44 1998
-+++ sshd.8.in	Thu Jun 11 19:52:42 1998
-@@ -406,7 +406,7 @@
+--- sshd.8.in.orig	Wed Jul  8 09:40:39 1998
++++ sshd.8.in	Sun Jul 12 17:48:14 1998
+@@ -413,7 +413,7 @@
  should print information whether you have new mail or not
  when a user logs in interactively.  (On some systems it is also
  printed by the shell, /etc/profile, or equivalent.)  The default is
 -"yes".
 +"no".
  
- .if \n(CO \{
- .TP
+ .\"
+ .\"
diff --git a/security/ssh/patches/patch-ag b/security/ssh/patches/patch-ag
index b44647afd81..9f2bc928879 100644
--- a/security/ssh/patches/patch-ag
+++ b/security/ssh/patches/patch-ag
@@ -1,6 +1,6 @@
---- sshconnect.c.orig	Thu Jun 11 07:01:13 1998
-+++ sshconnect.c	Thu Jun 11 19:52:42 1998
-@@ -332,6 +332,12 @@
+--- sshconnect.c.orig	Wed Jul  8 09:40:38 1998
++++ sshconnect.c	Sun Jul 12 17:48:14 1998
+@@ -339,6 +339,12 @@
      {
        struct sockaddr_in sin;
        int p;
@@ -13,7 +13,7 @@
        for (p = 1023; p > 512; p--)
  	{
  	  sock = socket(AF_INET, SOCK_STREAM, 0);
-@@ -359,6 +365,7 @@
+@@ -366,6 +372,7 @@
  	    }
  	  fatal("bind: %.100s", strerror(errno));
  	}
diff --git a/security/ssh/patches/patch-ah b/security/ssh/patches/patch-ah
index b264c318f9a..e4563139b5e 100644
--- a/security/ssh/patches/patch-ah
+++ b/security/ssh/patches/patch-ah
@@ -1,6 +1,6 @@
---- newchannels.c.orig	Thu Jun 11 07:01:12 1998
-+++ newchannels.c	Thu Jun 11 19:52:43 1998
-@@ -2383,6 +2383,10 @@
+--- newchannels.c.orig	Wed Jul  8 09:40:36 1998
++++ newchannels.c	Sun Jul 12 17:48:14 1998
+@@ -2388,6 +2388,10 @@
       ssh-agent connections on your system */
    old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
    
diff --git a/security/ssh/pkg/PLIST b/security/ssh/pkg/PLIST
index 10c4eb64cc5..8e5febb43b0 100644
--- a/security/ssh/pkg/PLIST
+++ b/security/ssh/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment PACKAGE(arch=sparc, opsys=OpenBSD, vers=2.3)
-@name ssh-1.2.25
 @cwd /usr/local
+@name ssh-1.2.26
 bin/ssh1
 bin/ssh
 bin/slogin