diff --git a/ChangeLog b/ChangeLog
index 905cb1159..05d9962ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20101201
+ - OpenBSD CVS Sync
+   - deraadt@cvs.openbsd.org 2010/11/20 05:12:38
+     [auth2-pubkey.c]
+     clean up cases of ;;
+
 20101124
  - (dtucker) [platform.c session.c] Move the getluid call out of session.c and
    into the platform-specific code  Only affects SCO, tested by and ok tim@.
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 35cf79c9f..7d2141355 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.26 2010/06/29 23:16:46 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -232,7 +232,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert)
 		if ((ep = strrchr(cp, ' ')) != NULL ||
 		    (ep = strrchr(cp, '\t')) != NULL) {
 			for (; *ep == ' ' || *ep == '\t'; ep++)
-				;;
+				;
 			line_opts = cp;
 			cp = ep;
 		}