diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 8f20318bff..fdcf88e1cc 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-15	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libmisc/shell/print-ls.c, libmisc/shell/main_msdosfmt.c:
+	Include <inttypes.h>.
+	Misc. 64bit-compatibility fixes.
+
 2010-06-14	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libnetworking/rtems/mkrootfs.h,
diff --git a/cpukit/libmisc/shell/main_msdosfmt.c b/cpukit/libmisc/shell/main_msdosfmt.c
index f38a58ee5f..c682e879eb 100644
--- a/cpukit/libmisc/shell/main_msdosfmt.c
+++ b/cpukit/libmisc/shell/main_msdosfmt.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include <rtems.h>
 #include <rtems/shell.h>
@@ -144,13 +145,13 @@ int rtems_shell_main_msdos_format(
   {
     printf (" %-20s: %s\n", "OEMName", "RTEMS");
     printf (" %-20s: %s\n", "VolLabel", "RTEMSDisk");
-    printf (" %-20s: %lu\n", "sectors per cluster", rqdata.sectors_per_cluster);
-    printf (" %-20s: %lu\n", "fats", rqdata.fat_num);
-    printf (" %-20s: %lu\n", "files per root dir", rqdata.files_per_root_dir);
+    printf (" %-20s: %" PRIu32 "\n", "sectors per cluster", rqdata.sectors_per_cluster);
+    printf (" %-20s: %" PRIu32 "\n", "fats", rqdata.fat_num);
+    printf (" %-20s: %" PRIu32 "\n", "files per root dir", rqdata.files_per_root_dir);
     printf (" %-20s: %i\n", "fat type", rqdata.fattype);
     printf (" %-20s: %d\n", "media", rqdata.media);
     printf (" %-20s: %d\n", "quick_format", rqdata.quick_format);
-    printf (" %-20s: %lu\n", "cluster align", rqdata.cluster_align);
+    printf (" %-20s: %" PRIu32 "\n", "cluster align", rqdata.cluster_align);
   }
 
   if (msdos_format (driver, &rqdata) < 0) {
diff --git a/cpukit/libmisc/shell/print-ls.c b/cpukit/libmisc/shell/print-ls.c
index 1823e28dfd..c19ce9009c 100644
--- a/cpukit/libmisc/shell/print-ls.c
+++ b/cpukit/libmisc/shell/print-ls.c
@@ -47,6 +47,8 @@ __RCSID("$NetBSD: print.c,v 1.40 2004/11/17 17:00:00 mycroft Exp $");
 #endif /* not lint */
 #endif
 
+#include <inttypes.h>
+
 #include <rtems.h>
 #include <rtems/libio.h>
 
@@ -147,7 +149,7 @@ printlong(rtems_shell_ls_globals* globals, DISPLAY *dp)
 		if (f_flags)
 			(void)printf("%-*s ", dp->s_flags, np->flags);
 		if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
-			(void)printf("%*lu, %*lu ",
+			(void)printf("%*"PRIu32", %*"PRIu32" ",
 			    dp->s_major, major(sp->st_rdev), dp->s_minor,
 			    minor(sp->st_rdev));
 		else