diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls
index 4ad96be..e7f54e3 100644
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@@ -4,7 +4,7 @@ base:
     - subnets
     - vlans
     - ospf
-  '*gw':
+  '*-gw':
     - dhcp
     - ospf.gw
   'anon1':
@@ -17,4 +17,3 @@ base:
   'server1':
     - lxc-containers.server1
     - switches
-    - ospf.gw
diff --git a/salt/ospf/ospfd.conf b/salt/ospf/ospfd.conf
index 4c0613a..d53a76d 100644
--- a/salt/ospf/ospfd.conf
+++ b/salt/ospf/ospfd.conf
@@ -20,7 +20,7 @@ router ospf
 
     network 172.20.72.0/21 area 0
     area 0 authentication message-digest
-{%- set redistribute = pillar['ospf']['redistribute'] %}
+{%- set redistribute = pillar['ospf'].get('redistribute') %}
 {%- if redistribute %}
 {%-   for kind in redistribute %}
     redistribute {{ kind }}