diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js
index 8181af4566f..c857d1e212a 100644
--- a/public/app/features/dashboard/dashboardSrv.js
+++ b/public/app/features/dashboard/dashboardSrv.js
@@ -22,6 +22,7 @@ function (angular, $, _, moment) {
 
       this.id = data.id || null;
       this.title = data.title || 'No Title';
+      this.description = data.description;
       this.tags = data.tags || [];
       this.style = data.style || "dark";
       this.timezone = data.timezone || '';
diff --git a/public/app/features/dashboard/export/exporter.ts b/public/app/features/dashboard/export/exporter.ts
index d3b94d7fae7..859199e3a07 100644
--- a/public/app/features/dashboard/export/exporter.ts
+++ b/public/app/features/dashboard/export/exporter.ts
@@ -26,9 +26,11 @@ export class DashboardExporter {
       _.each(row.panels, (panel) => {
         if (panel.datasource !== undefined) {
           promises.push(this.datasourceSrv.get(panel.datasource).then(ds => {
-            var refName = 'DS_' + ds.name.toUpperCase();
+            var refName = 'DS_' + ds.name.replace(' ', '_').toUpperCase();
             datasources[panel.datasource] = {
               name: refName,
+              label: ds.name,
+              description: '',
               type: 'datasource',
               pluginId: ds.meta.id,
               pluginName: ds.meta.name,
diff --git a/public/app/features/dashboard/import/import.html b/public/app/features/dashboard/import/import.html
index 7b60654dd50..5227569fcd8 100644
--- a/public/app/features/dashboard/import/import.html
+++ b/public/app/features/dashboard/import/import.html
@@ -62,7 +62,7 @@
 
 				<div ng-repeat="input in ctrl.inputs">
 					<div class="gf-form">
-						<label class="gf-form-label width-15">{{input.name}}</label>
+						<label class="gf-form-label width-15">{{input.label}}</label>
 						<div class="gf-form-select-wrapper" style="width: 100%">
 							<select class="gf-form-input" ng-model="input.value" ng-options="v.value as v.text for v in input.options" ng-change="ctrl.inputValueChanged()"></select>
 						</div>
diff --git a/public/app/features/dashboard/import/import.ts b/public/app/features/dashboard/import/import.ts
index dbf6b08c222..873b6d5d956 100644
--- a/public/app/features/dashboard/import/import.ts
+++ b/public/app/features/dashboard/import/import.ts
@@ -31,6 +31,8 @@ export class DashImportCtrl {
       for (let input of this.dash.__inputs) {
         var inputModel = {
           name: input.name,
+          label: input.label,
+          description: input.description,
           type: input.type,
           pluginId: input.pluginId,
           options: []
@@ -55,6 +57,8 @@ export class DashImportCtrl {
 
     if (sources.length === 0) {
       inputModel.error = "No data sources of type " + input.pluginName + " found";
+    } else if (inputModel.description) {
+      inputModel.info = inputModel.description;
     } else {
       inputModel.info = "Select a " + input.pluginName + " data source";
     }
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index bff5d615548..bd198fffa38 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -23,9 +23,13 @@
       <h5 class="section-heading">Details</h5>
 			<div class="gf-form">
 				<label class="gf-form-label width-7">Title</label>
-				<input type="text" class="gf-form-input width-25" ng-model='dashboard.title'></input>
+				<input type="text" class="gf-form-input width-30" ng-model='dashboard.title'></input>
 			</div>
-			<div class="gf-form">
+      <div class="gf-form">
+				<label class="gf-form-label width-7">Description</label>
+				<input type="text" class="gf-form-input width-30" ng-model='dashboard.description'></input>
+			</div>
+      <div class="gf-form">
 				<label class="gf-form-label width-7">
           Tags
           <info-popover mode="right-normal">Press enter to a add tag</info-popover>