diff --git a/generate b/generate
index bf838805..f42637b8 100755
--- a/generate
+++ b/generate
@@ -97,22 +97,25 @@ def gen_menu(structure, override, prefix):
 
         if len(item['menu']) == 1:
             # Simple menu entry
-            menu.append((item['path'], item['menu'][0]))
+            menu.append((item['path'], item['menu'][0],
+                         item.get("generator", "") == "link"))
         else:
             # Drop-down menu
             if sub_menu_title != item['menu'][0]:
                 if sub_menu:
-                    menu.append((sub_menu, sub_menu_title))
+                    menu.append((sub_menu, sub_menu_title, False))
                 sub_menu = []
                 sub_menu_title = item['menu'][0]
 
             # Simple menu entry
-            sub_menu.append((item['path'], item['menu'][-1]))
+            sub_menu.append((item['path'], item['menu'][-1],
+                             item.get("generator", "") == "link"))
 
     # Process the last drop-down menu
     if structure and sub_menu_title:
         if sub_menu:
-            menu.append((sub_menu, sub_menu_title))
+            menu.append((sub_menu, sub_menu_title,
+                         item.get("generator", "") == "link"))
 
     return menu
 
diff --git a/templates/common/header.tpl.html b/templates/common/header.tpl.html
index b9a56334..5b194876 100644
--- a/templates/common/header.tpl.html
+++ b/templates/common/header.tpl.html
@@ -38,7 +38,11 @@ <h3 class="p-heading--5 p-navigation__link u-no-margin--bottom">{{ sub_entry[1]
                       </li>
                     {% else %}
                       <li>
-                        <a href="{{ sub_entry[0] }}"  class="p-navigation__dropdown-item{% if page_menu[1] == sub_entry[1] %} is-selected{% endif %}">{{ sub_entry[1] }}</a>
+                        {% if sub_entry[2] %}
+                        <a href="{{ sub_entry[0] }}" target="_blank" class="p-navigation__dropdown-item{% if page_menu[1] == sub_entry[1] %} is-selected{% endif %}">{{ sub_entry[1] }}</a>
+                        {% else %}
+                        <a href="{{ sub_entry[0] }}" class="p-navigation__dropdown-item{% if page_menu[1] == sub_entry[1] %} is-selected{% endif %}">{{ sub_entry[1] }}</a>
+                        {% endif %}
                       </li>
                     {% endif %}
                   {% endfor %}