diff --git a/demo/src/app/components/+tabs/demos/basic/basic.html b/demo/src/app/components/+tabs/demos/basic/basic.html
index e2358923c0..5dfdea0ae6 100644
--- a/demo/src/app/components/+tabs/demos/basic/basic.html
+++ b/demo/src/app/components/+tabs/demos/basic/basic.html
@@ -1,6 +1,6 @@
 <div>
   <tabset>
-    <tab heading="Static title">Static content</tab>
+    <tab heading="Static title" id="tab1">Static content</tab>
     <tab heading="Static Title 1">Static content 1</tab>
     <tab heading="Static Title 2">Static content 2</tab>
     <tab (select)="alertMe()">
diff --git a/demo/src/app/components/+tabs/demos/basic/basic.ts b/demo/src/app/components/+tabs/demos/basic/basic.ts
index 46d5eb99ba..b5d30546c5 100644
--- a/demo/src/app/components/+tabs/demos/basic/basic.ts
+++ b/demo/src/app/components/+tabs/demos/basic/basic.ts
@@ -1,5 +1,4 @@
-import { Component, ViewChild } from '@angular/core';
-import { TabsetComponent } from 'ngx-bootstrap';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'demo-tabs-basic',
diff --git a/demo/src/assets/json/current-version.json b/demo/src/assets/json/current-version.json
index 44c38809e5..2947579fdb 100644
--- a/demo/src/assets/json/current-version.json
+++ b/demo/src/assets/json/current-version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.5"}
\ No newline at end of file
+{"version":"2.0.0-beta.6"}
\ No newline at end of file
diff --git a/demo/src/ng-api-doc.ts b/demo/src/ng-api-doc.ts
index 54b9e4e1f8..9f124cb07c 100644
--- a/demo/src/ng-api-doc.ts
+++ b/demo/src/ng-api-doc.ts
@@ -2464,7 +2464,7 @@ export const ngdoc: any = {
       {
         "name": "id",
         "type": "string",
-        "description": "<p>tab id </p>\n"
+        "description": "<p>tab id. The same id with suffix &#39;-link&#39; will be added to the corresponding &lt;li&gt; element  </p>\n"
       },
       {
         "name": "removable",
diff --git a/src/tabs/tab.directive.ts b/src/tabs/tab.directive.ts
index a65c379ec1..6ba4573021 100644
--- a/src/tabs/tab.directive.ts
+++ b/src/tabs/tab.directive.ts
@@ -15,9 +15,10 @@ import { TabsetComponent } from './tabset.component';
 @Directive({ selector: 'tab, [tab]' })
 export class TabDirective implements OnInit, OnDestroy {
   /** tab header text */
-  @Input() heading: string;
-  /** tab id */
-  @Input() id: string;
+  @Input() public heading: string;
+  /** tab id. The same id with suffix '-link' will be added to the corresponding &lt;li&gt; element  */
+  @HostBinding('attr.id')
+  @Input() public id: string;
   /** if true tab can not be activated */
   @Input() disabled: boolean;
   /** if true tab can be removable, additional button will appear */
diff --git a/src/tabs/tabset.component.html b/src/tabs/tabset.component.html
index 5cdb34675b..e1fce585a8 100644
--- a/src/tabs/tabset.component.html
+++ b/src/tabs/tabset.component.html
@@ -2,6 +2,7 @@
   <li *ngFor="let tabz of tabs" [ngClass]="['nav-item', tabz.customClass || '']"
       [class.active]="tabz.active" [class.disabled]="tabz.disabled">
     <a href="javascript:void(0);" class="nav-link"
+       [attr.id]="tabz.id ? tabz.id + '-link' : ''"
        [class.active]="tabz.active" [class.disabled]="tabz.disabled"
        (click)="tabz.active = true">
       <span [ngTransclude]="tabz.headingRef">{{ tabz.heading }}</span>