diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 3685b05d1..17331fcd9 100644
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -834,7 +834,7 @@ RemoteGDB::trap(int type)
         active = true;
     else
         // Tell remote host that an exception has occurred.
-        sprintf((char *)buffer, "S%02x", signal(type));
+        snprintf((char *)buffer, sizeof(buffer), "S%02x", signal(type));
         send(buffer);
 
     // Stick frame regs into our reg cache.
@@ -852,7 +852,7 @@ RemoteGDB::trap(int type)
             // if this command came from a running gdb, answer it --
             // the other guy has no way of knowing if we're in or out
             // of this loop when he issues a "remote-signal".
-            sprintf((char *)buffer, "S%02x", signal(type));
+            snprintf((char *)buffer, sizeof(buffer), "S%02x", signal(type));
             send(buffer);
             continue;
 
diff --git a/dev/ide_disk.cc b/dev/ide_disk.cc
index bd9aac8ea..f178e44ed 100644
--- a/dev/ide_disk.cc
+++ b/dev/ide_disk.cc
@@ -92,7 +92,8 @@ IdeDisk::IdeDisk(const string &name, DiskImage *img, PhysicalMemory *phys,
     }
 
     // Setup the model name
-    sprintf((char *)driveID.atap_model, "5MI EDD si k");
+    strncpy((char *)driveID.atap_model, "5MI EDD si k",
+            sizeof(driveID.atap_model));
     // Set the maximum multisector transfer size
     driveID.atap_multi = MAX_MULTSECT;
     // IORDY supported, IORDY disabled, LBA enabled, DMA enabled