diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 3f2feb7b8e01..fa239ae280c8 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd.c,v 1.275 2008/07/16 18:54:09 drochner Exp $	*/
+/*	$NetBSD: sd.c,v 1.276 2009/01/11 10:30:43 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.275 2008/07/16 18:54:09 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.276 2009/01/11 10:30:43 cegger Exp $");
 
 #include "opt_scsi.h"
 #include "rnd.h"
@@ -437,7 +437,7 @@ sdopen(dev_t dev, int flag, int fmt, struct lwp *l)
 	adapt = periph->periph_channel->chan_adapter;
 
 	SC_DEBUG(periph, SCSIPI_DB1,
-	    ("sdopen: dev=0x%x (unit %d (of %d), partition %d)\n", dev, unit,
+	    ("sdopen: dev=0x%"PRIx64" (unit %d (of %d), partition %d)\n", dev, unit,
 	    sd_cd.cd_ndevs, part));
 
 	/*
diff --git a/sys/dist/pf/net/pf_norm.c b/sys/dist/pf/net/pf_norm.c
index b9a50610863f..102e2e3b3d21 100644
--- a/sys/dist/pf/net/pf_norm.c
+++ b/sys/dist/pf/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf_norm.c,v 1.19 2008/06/18 09:06:27 yamt Exp $	*/
+/*	$NetBSD: pf_norm.c,v 1.20 2009/01/11 10:29:01 cegger Exp $	*/
 /*	$OpenBSD: pf_norm.c,v 1.109 2007/05/28 17:16:39 henning Exp $ */
 
 /*
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.19 2008/06/18 09:06:27 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.20 2009/01/11 10:29:01 cegger Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1743,9 +1743,9 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
 			    SEQ_GT(tsecr, dst->scrub->pfss_tsval) ? '2' : ' ',
 			    SEQ_LT(tsecr, dst->scrub->pfss_tsval0)? '3' : ' '));
 			DPFPRINTF((" tsval: %" PRIu32 "  tsecr: %" PRIu32
-			    "  +ticks: %" PRIu32 "  idle: %lus %lums\n",
+			    "  +ticks: %" PRIu32 "  idle: %"PRIx64"s %ums\n",
 			    tsval, tsecr, tsval_from_last, delta_ts.tv_sec,
-			    delta_ts.tv_usec / 1000));
+			    delta_ts.tv_usec / 1000U));
 			DPFPRINTF((" src->tsval: %" PRIu32 "  tsecr: %" PRIu32
 			    "\n",
 			    src->scrub->pfss_tsval, src->scrub->pfss_tsecr));
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 7def83309b33..98487a894aa2 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vnops.c,v 1.56 2009/01/11 02:45:51 christos Exp $	*/
+/*	$NetBSD: msdosfs_vnops.c,v 1.57 2009/01/11 10:25:29 cegger Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.56 2009/01/11 02:45:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.57 2009/01/11 10:25:29 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -358,10 +358,10 @@ msdosfs_setattr(v)
 	    (vap->va_gid != VNOVAL && vap->va_gid != pmp->pm_gid)) {
 #ifdef MSDOSFS_DEBUG
 		printf("msdosfs_setattr(): returning EINVAL\n");
-		printf("    va_type %d, va_nlink %x, va_fsid %lx, va_fileid %llx\n",
+		printf("    va_type %d, va_nlink %x, va_fsid %"PRIx64", va_fileid %llx\n",
 		    vap->va_type, vap->va_nlink, vap->va_fsid,
 		    (unsigned long long)vap->va_fileid);
-		printf("    va_blocksize %lx, va_rdev %x, va_bytes %qx, va_gen %lx\n",
+		printf("    va_blocksize %lx, va_rdev %"PRIx64", va_bytes %"PRIx64", va_gen %lx\n",
 		    vap->va_blocksize, vap->va_rdev, (long long)vap->va_bytes, vap->va_gen);
 #endif
 		return (EINVAL);