diff --git a/package-lock.json b/package-lock.json
index d3eb3e3fc..7e8e922b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1859,6 +1859,21 @@
 				}
 			}
 		},
+		"@nextcloud/l10n": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-0.2.1.tgz",
+			"integrity": "sha512-iLdyxluCehsRibR4R/nH3O8T9CcGoAaW3eWEdQW2qPtn6eEiBXASek5nWhXa5hko1GvE7koYia4FoTWuL85/Ng==",
+			"requires": {
+				"core-js": "3.2.1"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
+					"integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
+				}
+			}
+		},
 		"@nextcloud/router": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-0.1.0.tgz",
diff --git a/package.json b/package.json
index e94fcf6e1..1b547c722 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,8 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.6.0",
+		"@nextcloud/l10n": "^0.2.1",
+		"@nextcloud/router": "^0.1.0",
 		"nextcloud-axios": "^0.2.1",
 		"nextcloud-server": "^0.15.10",
 		"nextcloud-vue": "^0.12.6",
diff --git a/src/main.js b/src/main.js
index ca84ef442..7e86892a6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,8 +24,8 @@ import App from './App'
 import router from './router'
 import store from './store/main'
 import { sync } from 'vuex-router-sync'
-import { translate, translatePlural } from 'nextcloud-server/dist/l10n'
-import { generateFilePath } from 'nextcloud-server/dist/router'
+import { translate, translatePlural } from '@nextcloud/l10n'
+import { generateFilePath } from '@nextcloud/router'
 import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
 import './models'
 
diff --git a/src/router.js b/src/router.js
index 84ac149cb..2eab2f982 100644
--- a/src/router.js
+++ b/src/router.js
@@ -22,7 +22,7 @@
 
 import Vue from 'vue'
 import Router from 'vue-router'
-import { generateUrl } from 'nextcloud-server/dist/router'
+import { generateUrl } from '@nextcloud/router'
 import { BOARD_FILTERS } from './store/main'
 import Boards from './components/boards/Boards'
 import Board from './components/board/Board'