diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index ee452e0b35..147e3fd924 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -62,6 +62,7 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
     m_pinTypeRegex.Compile( "^Pin_Type\\s*[!=]=\\s*$", wxRE_ADVANCED );
     m_fabPropRegex.Compile( "^Fabrication_Property\\s*[!=]=\\s*$", wxRE_ADVANCED );
     m_shapeRegex.Compile( "^Shape\\s*[!=]=\\s*$", wxRE_ADVANCED );
+    m_zoneConnStyleRegex.Compile( "^Zone_Connection_Style\\s*[!=]=\\s*$", wxRE_ADVANCED );
 
     m_compileButton->SetBitmap( KiBitmap( BITMAPS::drc ) );
 
@@ -544,6 +545,13 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
                               "Polygon|"
                               "Bezier" );
             }
+            else if( m_zoneConnStyleRegex.Matches( last ) )
+            {
+                tokens = wxT( "Inherited|"
+                              "None|"
+                              "Solid|"
+                              "Thermal reliefs" );
+            }
         }
     }
 
diff --git a/pcbnew/dialogs/panel_setup_rules.h b/pcbnew/dialogs/panel_setup_rules.h
index bd97f761d5..9c3ee18e2b 100644
--- a/pcbnew/dialogs/panel_setup_rules.h
+++ b/pcbnew/dialogs/panel_setup_rules.h
@@ -65,6 +65,7 @@ private:
     wxRegEx           m_pinTypeRegex;
     wxRegEx           m_fabPropRegex;
     wxRegEx           m_shapeRegex;
+    wxRegEx           m_zoneConnStyleRegex;
 
     HTML_MESSAGE_BOX* m_helpWindow;
 };