diff --git a/subcommands/skins/skinpack.go b/subcommands/skins/skinpack.go
index 2d3dfef..d400fb7 100644
--- a/subcommands/skins/skinpack.go
+++ b/subcommands/skins/skinpack.go
@@ -72,7 +72,11 @@ func (s *SkinPack) Save(fpath, serverName string) error {
 			}
 		}
 
-		entry := skinEntry{LocalizationName: skinName, Texture: skinName, Type: "free"}
+		entry := skinEntry{
+			LocalizationName: skinName,
+			Texture:          skinName + ".png",
+			Type:             "free",
+		}
 		if s2.skin.ArmSize == "wide" {
 			entry.Geometry = "minecraft.geometry.steve"
 		} else {
diff --git a/subcommands/skins/skins.go b/subcommands/skins/skins.go
index 34a4836..f760c81 100644
--- a/subcommands/skins/skins.go
+++ b/subcommands/skins/skins.go
@@ -111,7 +111,7 @@ func (s *skinsSession) ProcessPacket(pk packet.Packet) {
 func (s *skinsSession) Save(fpath string) error {
 	logrus.Infof("Saving %d players", len(s.playerSkinPacks))
 	for id, sp := range s.playerSkinPacks {
-		err := sp.Save(path.Join(fpath, s.playerNames[id]))
+		err := sp.Save(path.Join(fpath, s.playerNames[id]), s.ServerName)
 		if err != nil {
 			logrus.Warn(err)
 		}