diff --git a/pwiki/page.js b/pwiki/page.js
index 943bd5c..8971334 100755
--- a/pwiki/page.js
+++ b/pwiki/page.js
@@ -2937,6 +2937,9 @@ for(var i=0; i<PAGES; i++){
 
 var Config =
 module.Config = {
+	Import: {
+		text: '<input type="file" onchange="importData()" accept=".json, .pwiki">'
+	},
 	// XXX need an import button...
 	Export: {
 		text: '<button onclick="exportData()">Export</button>' },
diff --git a/pwiki2.html b/pwiki2.html
index 9c09c27..e83ac34 100755
--- a/pwiki2.html
+++ b/pwiki2.html
@@ -545,7 +545,17 @@ require(['./browser'], function(browser){
 // Export/Import...
 
 // XXX
-var importData = function(){}
+var importData = function(evt){
+	var files = event.target.files
+	var reader = new FileReader()
+	reader.addEventListener('load', function(evt){
+		var json = JSON.parse(evt.target.result)
+		console.log('LOADING JSON:', json)
+		pwiki.store
+			.load(json)
+			.then(function(){
+				location.reload() }) })
+	reader.readAsText(files[0]) }
 
 // XXX
 var exportData = async function(options={}){
@@ -561,7 +571,7 @@ var exportData = async function(options={}){
     var blobURL = a.href = URL.createObjectURL(blob)
     a.download = filename
 		?? options.filename 
-		?? (Date.timeStamp() +'.pWiki.json')
+		?? (Date.timeStamp() +'.pWiki-export.pwiki')
 
     //document.body.appendChild(a)
     a.dispatchEvent(new MouseEvent("click"))