diff --git a/public/app/panels/table/module.html b/public/app/panels/table/module.html
index c85252354dc..75d428acf6a 100644
--- a/public/app/panels/table/module.html
+++ b/public/app/panels/table/module.html
@@ -2,5 +2,7 @@
 	<grafana-panel>
 		<div class="table-panel-container">
 		</div>
+		<div class="table-panel-footer">
+		</div>
 	</grafana-panel>
 </div>
diff --git a/public/app/panels/table/module.ts b/public/app/panels/table/module.ts
index 6103e11113b..f4da7161f6f 100644
--- a/public/app/panels/table/module.ts
+++ b/public/app/panels/table/module.ts
@@ -15,6 +15,7 @@ export class TablePanelCtrl {
   constructor($scope, $rootScope, $q, panelSrv, panelHelper) {
     $scope.ctrl = this;
     $scope.transformers = transformers;
+    $scope.pageIndex = 0;
 
     $scope.panelMeta = new PanelMeta({
       panelName: 'Table',
@@ -68,6 +69,7 @@ export function tablePanelDirective() {
     controller: TablePanelCtrl,
     link: function(scope, elem) {
       var data;
+      var panel = scope.panel;
 
       function getTableHeight() {
         var panelHeight = scope.height || scope.panel.height || scope.row.height;
@@ -78,39 +80,67 @@ export function tablePanelDirective() {
         return (panelHeight - 40) + 'px';
       }
 
-      function renderPanel() {
-        var rootDiv = elem.find('.table-panel-container');
-        var tableDiv = $('<table class="gf-table-panel"></table>');
-        var i, y, rowElem, colElem, column, row;
-
-        rowElem = $('<tr></tr>');
-        for (i = 0; i < data.columns.length; i++) {
-          column = data.columns[i];
-          colElem = $('<th>' + column.text + '</th>');
+      function appendTableHeader(tableElem) {
+        var rowElem = $('<tr></tr>');
+        for (var i = 0; i < data.columns.length; i++) {
+          var column = data.columns[i];
+          var colElem = $('<th>' + column.text + '</th>');
           rowElem.append(colElem);
         }
 
         var headElem = $('<thead></thead>');
         headElem.append(rowElem);
+        headElem.appendTo(tableElem);
+      }
 
+      function appendTableRows(tableElem) {
         var tbodyElem = $('<tbody></tbody>');
-        for (y = 0; y < data.rows.length; y++) {
-          row = data.rows[y];
-          rowElem = $('<tr></tr>');
-          for (i = 0; i < data.columns.length; i++) {
-            colElem = $('<td>' + row[i] + '</td>');
+        var rowEnd = Math.min(panel.pageSize, data.rows.length);
+        var rowStart = 0;
+
+        for (var y = rowStart; y < rowEnd; y++) {
+          var row = data.rows[y];
+          var rowElem = $('<tr></tr>');
+          for (var i = 0; i < data.columns.length; i++) {
+            var colElem = $('<td>' + row[i] + '</td>');
             rowElem.append(colElem);
           }
           tbodyElem.append(rowElem);
         }
 
-        tableDiv.append(headElem);
-        tableDiv.append(tbodyElem);
+        tableElem.append(tbodyElem);
+      }
 
-        rootDiv.css({'max-height': getTableHeight()});
+      function appendPaginationControls(footerElem) {
+        var paginationElem = $('<div class="pagination">');
+        var paginationList = $('<ul></ul>');
 
-        rootDiv.empty();
-        rootDiv.append(tableDiv);
+        var pageCount = data.rows.length / panel.pageSize;
+        for (var i = 0; i < pageCount; i++) {
+          var pageLinkElem = $('<li><a href="#">' + (i+1) + '</a></li>');
+          paginationList.append(pageLinkElem);
+        }
+
+        var nextLink = $('<li><a href="#">»</a></li>');
+        paginationList.append(nextLink);
+        paginationElem.append(paginationList);
+
+        footerElem.empty();
+        footerElem.append(paginationElem);
+      }
+
+      function renderPanel() {
+        var rootElem = elem.find('.table-panel-container');
+        var footerElem = elem.find('.table-panel-footer');
+        var tableElem = $('<table class="gf-table-panel"></table>');
+
+        appendTableHeader(tableElem);
+        appendTableRows(tableElem);
+
+        rootElem.css({'max-height': getTableHeight()});
+        rootElem.empty();
+        rootElem.append(tableElem);
+        appendPaginationControls(footerElem);
       }
 
       scope.$on('render', function(event, renderData) {
@@ -126,4 +156,3 @@ export function tablePanelDirective() {
 }
 
 angular.module('grafana.directives').directive('grafanaPanelTable', tablePanelDirective);
-
diff --git a/public/app/panels/table/options.html b/public/app/panels/table/options.html
index 717259df40f..8c91cc1ecf9 100644
--- a/public/app/panels/table/options.html
+++ b/public/app/panels/table/options.html
@@ -21,14 +21,19 @@
 <div class="editor-row">
 	<div class="tight-form-section">
 		<h5>Table Display</h5>
+		<div class="tight-form">
+			<ul class="tight-form-list">
+				<li class="tight-form-item">
+					Pagination (Page size)
+				</li>
+				<li>
+					<input type="text" class="input-small tight-form-input" placeholder="50"
+					empty-to-null ng-model="panel.pageSize" ng-change="render()" ng-model-onblur>
+				</li>
+			</ul>
+			<div class="clearfix"></div>
+		</div>
 	</div>
-	<li class="tight-form-item" style="width: 80px">
-		Pagination (Page size)
-	</li>
-	<li>
-		<input type="pageSize" class="input-small tight-form-input" placeholder="50"
-		empty-to-null ng-model="panel.pageSize" ng-change="render()" ng-model-onblur>
-	</li>
 </div>
 
 <div class="editor-row">
diff --git a/public/less/grafana.less b/public/less/grafana.less
index e82c3b93c01..041c0112481 100644
--- a/public/less/grafana.less
+++ b/public/less/grafana.less
@@ -15,6 +15,7 @@
 @import "navbar.less";
 @import "gfbox.less";
 @import "admin.less";
+@import "pagination.less";
 @import "validation.less";
 @import "fonts.less";
 @import "tabs.less";
diff --git a/public/less/pagination.less b/public/less/pagination.less
new file mode 100644
index 00000000000..6e292e5ab37
--- /dev/null
+++ b/public/less/pagination.less
@@ -0,0 +1,113 @@
+.pagination {
+}
+
+.pagination ul {
+  display: inline-block;
+  margin-left: 0;
+  margin-bottom: 0;
+  .border-radius(@baseBorderRadius);
+  .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination ul > li {
+  display: inline; // Remove list-style and block-level defaults
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left; // Collapse white-space
+  padding: 4px 12px;
+  line-height: @baseLineHeight;
+  text-decoration: none;
+  background-color: @paginationBackground;
+  border: 1px solid @paginationBorder;
+  border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: @paginationActiveBackground;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: @grayLight;
+  cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: @grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  .border-left-radius(@baseBorderRadius);
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  .border-right-radius(@baseBorderRadius);
+}
+
+
+// Alignment
+// --------------------------------------------------
+
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+
+
+// Sizing
+// --------------------------------------------------
+
+// Large
+.pagination-large {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingLarge;
+    font-size: @fontSizeLarge;
+  }
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    .border-left-radius(@borderRadiusLarge);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    .border-right-radius(@borderRadiusLarge);
+  }
+}
+
+// Small and mini
+.pagination-mini,
+.pagination-small {
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    .border-left-radius(@borderRadiusSmall);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    .border-right-radius(@borderRadiusSmall);
+  }
+}
+
+// Small
+.pagination-small {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingSmall;
+    font-size: @fontSizeSmall;
+  }
+}
+// Mini
+.pagination-mini {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingMini;
+    font-size: @fontSizeMini;
+  }
+}
diff --git a/public/less/panel_table.less b/public/less/panel_table.less
index 8f7dea39f9a..272f5a5c3dc 100644
--- a/public/less/panel_table.less
+++ b/public/less/panel_table.less
@@ -11,6 +11,13 @@
   overflow: auto;
 }
 
+.table-panel-footer {
+  text-align: center;
+  .pagination {
+    display: inline-block;
+  }
+}
+
 .gf-table-panel* {
   box-sizing: border-box;
 }
@@ -25,10 +32,11 @@
 }
 
 .gf-table-panel th {
-  background: @grafanaTargetFuncBackground;
+  background: @grafanaListAccent;
   padding: 5px 0 5px 15px;
   text-align: left;
   border-top: 2px solid @bodyBackground;
+  color: @blue;
 
   &:first-child {
     padding-left: 15px;
@@ -36,7 +44,7 @@
 }
 
 .gf-table-panel td {
-  padding: 15px 0 15px 15px;
+  padding: 12px 0 12px 15px;
 
   &:first-child {
     padding-left: 15px;