diff --git a/lib/core/nav/HeaderNav.js b/lib/core/nav/HeaderNav.js
index 3b45a26335..ae7663bf2d 100644
--- a/lib/core/nav/HeaderNav.js
+++ b/lib/core/nav/HeaderNav.js
@@ -91,7 +91,7 @@ class HeaderNav extends React.Component {
     };
   }
 
-  makeLinks(link) {
+  makeInternalLinks(link) {
     const linkWithLang = link.href.replace(
       /\/LANGUAGE\//,
       "/" + this.props.language + "/"
@@ -110,6 +110,26 @@ class HeaderNav extends React.Component {
     );
   }
 
+  makeExternalLinks(link) {
+    const linkWithLang = link.href.replace(
+      /\/LANGUAGE\//,
+      "/" + this.props.language + "/"
+    );
+    return (
+      <li key={link.section}>
+        <a
+          href={linkWithLang}
+          className={link.section === this.props.section ? "active" : ""}
+          target={siteConfig.externalLinkTarget || "_self"}
+        >
+          {translation[this.props.language]
+            ? translation[this.props.language]["localized-strings"][link.text]
+            : link.text}
+        </a>
+      </li>
+    );
+  }
+
   render() {
     return (
       <div className="fixedHeaderContainer">
@@ -134,7 +154,10 @@ class HeaderNav extends React.Component {
       <div className="navigationWrapper navigationSlider">
         <nav className="slidingNav">
           <ul className="nav-site nav-site-internal">
-            {this.props.config.headerLinksInternal.map(this.makeLinks, this)}
+            {this.props.config.headerLinksInternal.map(
+              this.makeInternalLinks,
+              this
+            )}
             <LanguageDropDown
               baseUrl={this.props.baseUrl}
               language={this.props.language}
@@ -147,7 +170,10 @@ class HeaderNav extends React.Component {
                   placeholder="Search"
                 />
               </li>}
-            {this.props.config.headerLinksExternal.map(this.makeLinks, this)}
+            {this.props.config.headerLinksExternal.map(
+              this.makeExternalLinks,
+              this
+            )}
           </ul>
         </nav>
       </div>
diff --git a/package.json b/package.json
index 3563f659c1..e84a578efd 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "shelljs": "^0.7.8"
   },
   "name": "docusaurus",
-  "version": "1.0.0-alpha.27",
+  "version": "1.0.0-alpha.28",
   "bin": {
     "docusaurus-start": "./lib/start-server.js",
     "docusaurus-build": "./lib/build-files.js",