diff --git a/ChangeLog b/ChangeLog
index d2eb5ab42..6107e1a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020424
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/04/23 12:54:10
+     [version.h]
+     3.2.1
+
 20020423
  - (stevesk) [acconfig.h configure.ac session.c] LOGIN_NO_ENDOPT for HP-UX
  - (stevesk) [acconfig.h] NEED_IN_SYSTM_H unused
@@ -494,4 +500,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2081 2002/04/23 20:45:55 stevesk Exp $
+$Id: ChangeLog,v 1.2082 2002/04/23 23:48:14 djm Exp $
diff --git a/version.h b/version.h
index 20eb6feb9..c67cf1b4d 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-/* $OpenBSD: version.h,v 1.29 2002/04/10 08:56:01 markus Exp $ */
+/* $OpenBSD: version.h,v 1.30 2002/04/23 12:54:10 markus Exp $ */
 
-#define SSH_VERSION	"OpenSSH_3.2p1"
+#define SSH_VERSION	"OpenSSH_3.2.1p1"