diff --git a/coders/svg.c b/coders/svg.c
index 727a255..49da936 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -1252,9 +1252,9 @@
               (void) FormatLocaleFile(svg_info->file,"fill-rule '%s'\n",value);
               break;
             }
-          if (LocaleCompare(keyword,"fill-alpha") == 0)
+          if (LocaleCompare(keyword,"fill-opacity") == 0)
             {
-              (void) FormatLocaleFile(svg_info->file,"fill-alpha '%s'\n",
+              (void) FormatLocaleFile(svg_info->file,"fill-opacity '%s'\n",
                 value);
               break;
             }
@@ -1714,10 +1714,10 @@
                           "fill-rule '%s'\n",value);
                         break;
                       }
-                    if (LocaleCompare(keyword,"fill-alpha") == 0)
+                    if (LocaleCompare(keyword,"fill-opacity") == 0)
                       {
                         (void) FormatLocaleFile(svg_info->file,
-                          "fill-alpha '%s'\n",value);
+                          "fill-opacity '%s'\n",value);
                         break;
                       }
                     if (LocaleCompare(keyword,"font-family") == 0)
@@ -3900,11 +3900,11 @@
             (void) WriteBlobString(image,message);
             break;
           }
-        if (LocaleCompare("fill-alpha",keyword) == 0)
+        if (LocaleCompare("fill-opacity",keyword) == 0)
           {
             GetNextToken(q,&q,extent,token);
             (void) FormatLocaleString(message,MagickPathExtent,
-              "fill-alpha:%s;",token);
+              "fill-opacity:%s;",token);
             (void) WriteBlobString(image,message);
             break;
           }
