2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d48e8f5f..d9f7ad996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
      GSSAPIDeletegateCredentials=yes and another authentication mechanism 
      succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by 
      simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@
+   - markus@cvs.openbsd.org 2005/08/31 09:28:42
+     [version.h]
+     4.2
 
 20050830
  - (tim) [configure.ac] Back out last change. It needs to be done differently.
@@ -2978,4 +2981,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3883 2005/08/31 09:46:26 djm Exp $
+$Id: ChangeLog,v 1.3884 2005/08/31 09:47:07 djm Exp $
diff --git a/version.h b/version.h
index f6625230e..b9c87e2fb 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.44 2005/03/16 21:17:39 markus Exp $ */
+/* $OpenBSD: version.h,v 1.45 2005/08/31 09:28:42 markus Exp $ */
 
-#define SSH_VERSION     "OpenSSH_4.1"
+#define SSH_VERSION     "OpenSSH_4.2"
 
 #define SSH_PORTABLE    "p1"
 #define SSH_RELEASE     SSH_VERSION SSH_PORTABLE