diff --git a/src/ai_dfool.cpp b/src/ai_dfool.cpp
index ffb6bcd8076..08305f31d46 100644
--- a/src/ai_dfool.cpp
+++ b/src/ai_dfool.cpp
@@ -16,7 +16,7 @@ namespace dfool {
 
     config side_filter;
     char buf[80];
-    sprintf(buf,"%d",team_num);
+    snprintf(buf, sizeof(buf), "%d", team_num);
     side_filter["side"]=buf;
 
     LOG_STREAM(info, ai)<<"dfool sees:"<<std::endl;
diff --git a/src/unit.cpp b/src/unit.cpp
index 0c29c35e2b7..b7d73ff719e 100644
--- a/src/unit.cpp
+++ b/src/unit.cpp
@@ -272,9 +272,9 @@ unit::unit(const game_data* gamedata, unit_map* unitmap, const gamemap* map,
 	if(underlying_description_.empty()){
 	  char buf[80];
 	  if(!custom_unit_description_.empty()){
-	    sprintf(buf,"%s-%d-%s",type()->id().c_str(),(SDL_GetTicks()), custom_unit_description_.c_str());
+	    snprintf(buf, sizeof(buf), "%s-%d-%s",type()->id().c_str(),(SDL_GetTicks()), custom_unit_description_.c_str());
 	  }else{
-	    sprintf(buf,"%s-%d",type()->id().c_str(),(SDL_GetTicks()));
+	    snprintf(buf, sizeof(buf), "%s-%d",type()->id().c_str(),(SDL_GetTicks()));
 	  }
 	  underlying_description_ = buf;
 	}
@@ -320,9 +320,9 @@ unit::unit(const unit_type* t, int side, bool use_traits, bool dummy_unit, unit_
 	if(underlying_description_.empty()){
 	  char buf[80];
 	  if(!custom_unit_description_.empty()){
-	    sprintf(buf,"%s-%d-%s",type()->id().c_str(),(SDL_GetTicks()), custom_unit_description_.c_str());
+	    snprintf(buf, sizeof(buf), "%s-%d-%s",type()->id().c_str(),(SDL_GetTicks()), custom_unit_description_.c_str());
 	  }else{
-	    sprintf(buf,"%s-%d",type()->id().c_str(),(SDL_GetTicks()));
+	    snprintf(buf, sizeof(buf), "%s-%d",type()->id().c_str(),(SDL_GetTicks()));
 	  }
 	  underlying_description_ = buf;
 	}
@@ -949,7 +949,7 @@ void unit::read(const config& cfg)
 	underlying_description_ = cfg["description"];
 	if(underlying_description_.empty()){
 	  char buf[80];
-	  sprintf(buf,"%s-%d",cfg["type"].c_str(),(SDL_GetTicks()%1000000));
+	  snprintf(buf, sizeof(buf), "%s-%d",cfg["type"].c_str(),(SDL_GetTicks()%1000000));
 	  underlying_description_ = buf;
 	}
 	if(description_.empty()) {