diff --git a/interface-definitions/system-option.xml.in b/interface-definitions/system-option.xml.in
index 0fa349e0b..efab50a66 100644
--- a/interface-definitions/system-option.xml.in
+++ b/interface-definitions/system-option.xml.in
@@ -1,147 +1,151 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="system">
     <children>
       <node name="option" owner="${vyos_conf_scripts_dir}/system-option.py">
         <properties>
           <help>System Options</help>
           <priority>9999</priority>
         </properties>
         <children>
           <leafNode name="ctrl-alt-delete">
             <properties>
               <help>System action on Ctrl-Alt-Delete keystroke</help>
               <completionHelp>
                 <list>ignore reboot poweroff</list>
               </completionHelp>
               <valueHelp>
                 <format>ignore</format>
                 <description>Ignore key sequence</description>
               </valueHelp>
               <valueHelp>
                 <format>reboot</format>
                 <description>Reboot system</description>
               </valueHelp>
               <valueHelp>
                 <format>poweroff</format>
                 <description>Poweroff system</description>
               </valueHelp>
               <constraint>
                 <regex>(ignore|reboot|poweroff)</regex>
               </constraint>
               <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage>
             </properties>
            </leafNode>
            <leafNode name="keyboard-layout">
              <properties>
                <help>System keyboard layout, type ISO2</help>
                <completionHelp>
-                 <list>us uk fr de es fi jp106 no dk dvorak</list>
+                 <list>us uk fr de es fi jp106 no dk se-latin1 dvorak</list>
                </completionHelp>
                <valueHelp>
                  <format>us</format>
                  <description>United States</description>
                </valueHelp>
                <valueHelp>
                  <format>uk</format>
                  <description>United Kingdom</description>
                </valueHelp>
                <valueHelp>
                  <format>fr</format>
                  <description>France</description>
                </valueHelp>
                <valueHelp>
                  <format>de</format>
                  <description>Germany</description>
                </valueHelp>
                <valueHelp>
                  <format>es</format>
                  <description>Spain</description>
                </valueHelp>
                <valueHelp>
                  <format>fi</format>
                  <description>Finland</description>
                </valueHelp>
                <valueHelp>
                  <format>jp106</format>
                  <description>Japan</description>
                </valueHelp>
                <valueHelp>
                  <format>no</format>
                  <description>Norway</description>
                </valueHelp>
                <valueHelp>
                  <format>dk</format>
                  <description>Denmark</description>
                </valueHelp>
+               <valueHelp>
+                 <format>se-latin1</format>
+                 <description>Sweden</description>
+               </valueHelp>
                <valueHelp>
                  <format>dvorak</format>
                  <description>Dvorak</description>
                </valueHelp>
                <constraint>
-                <regex>(us|uk|fr|de|es|fi|jp106|no|dk|dvorak)</regex>
+                <regex>(us|uk|fr|de|es|fi|jp106|no|dk|se-latin1|dvorak)</regex>
               </constraint>
               <constraintErrorMessage>Invalid keyboard layout</constraintErrorMessage>
              </properties>
              <defaultValue>us</defaultValue>
            </leafNode>
            <leafNode name="performance">
             <properties>
               <help>Tune system performance</help>
               <completionHelp>
                 <list>throughput latency</list>
               </completionHelp>
               <valueHelp>
                 <format>throughput</format>
                 <description>Tune for maximum network throughput</description>
               </valueHelp>
               <valueHelp>
                 <format>latency</format>
                 <description>Tune for low network latency</description>
               </valueHelp>
               <constraint>
                 <regex>(throughput|latency)</regex>
               </constraint>
             </properties>
            </leafNode>
            <node name="http-client">
              <properties>
                <help>Global options used for HTTP client</help>
              </properties>
              <children>
                #include <include/source-interface.xml.i>
                #include <include/source-address-ipv4-ipv6.xml.i>
              </children>
            </node>
            <leafNode name="reboot-on-panic">
              <properties>
                <help>Reboot system on kernel panic</help>
                <valueless/>
              </properties>
            </leafNode>
            <node name="ssh-client">
              <properties>
                <help>Global options used for SSH client</help>
              </properties>
              <children>
                #include <include/source-address-ipv4-ipv6.xml.i>
                #include <include/source-interface.xml.i>
              </children>
            </node>
            <leafNode name="startup-beep">
              <properties>
                <help>plays sound via system speaker when you can login</help>
                <valueless/>
              </properties>
            </leafNode>
            <leafNode name="root-partition-auto-resize">
              <properties>
                <help>Enable root partition auto-extention on system boot</help>
                <valueless/>
              </properties>
            </leafNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>