diff --git a/Makefile b/Makefile
index c94379363..d4e0f9505 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ utupdate: all
 	ln -sf ../../$(UBUNTUTOUCH_DIR)/koreader.apparmor.openstore $(INSTALL_DIR)/koreader
 	ln -sf ../../$(UBUNTUTOUCH_DIR)/koreader.desktop $(INSTALL_DIR)/koreader
 	ln -sf ../../$(UBUNTUTOUCH_DIR)/koreader.png $(INSTALL_DIR)/koreader
-	ln -sf ../../../$(UBUNTUTOUCH_SDL_DIR)/lib/arm-linux-gnueabihf/libSDL2.so $(INSTALL_DIR)/koreader/libs
+	ln -sf ../../$(UBUNTUTOUCH_DIR)/libSDL2.so $(INSTALL_DIR)/koreader/libs
 
 	# create new package
 	cd $(INSTALL_DIR) && pwd && \
diff --git a/platform/ubuntu-touch/libSDL2.so b/platform/ubuntu-touch/libSDL2.so
new file mode 100644
index 000000000..550768bff
Binary files /dev/null and b/platform/ubuntu-touch/libSDL2.so differ
diff --git a/plugins/evernote.koplugin/main.lua b/plugins/evernote.koplugin/main.lua
index 11241dfe4..c81d617b9 100644
--- a/plugins/evernote.koplugin/main.lua
+++ b/plugins/evernote.koplugin/main.lua
@@ -7,6 +7,8 @@ local DocSettings = require("docsettings")
 local UIManager = require("ui/uimanager")
 local Screen = require("device").screen
 local Event = require("ui/event")
+local util = require("ffi/util")
+local Device = require("device")
 local DEBUG = require("dbg")
 local T = require("ffi/util").template
 local _ = require("gettext")
@@ -40,7 +42,17 @@ function EvernoteExporter:init()
         history_dir = "./history",
     }
     self.template = slt2.loadfile(self.path.."/note.tpl")
-    self.config = DocSettings:open(self.path)
+    self:migrateClippings()
+    self.config = DocSettings:open(util.joinPath(self.clipping_dir, "evernote.sdr"))
+end
+
+function EvernoteExporter:migrateClippings()
+    local old_dir = util.joinPath(util.realpath(util.joinPath(self.path, "..")),
+        "evernote.sdr")
+    if lfs.attributes(old_dir, "mode") == "directory" then
+        local mv_bin = Device:isAndroid() and "/system/bin/mv" or "/bin/mv"
+        return util.execute(mv_bin, old_dir, self.clipping_dir) == 0
+    end
 end
 
 function EvernoteExporter:addToMainMenu(tab_item_table)