diff --git a/Makefile b/Makefile
index fa592d8c..d93357a6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,11 @@ ghdist:
 	cd dist && git checkout gh-pages
 
 publish:
-	./node_modules/gulp/bin/gulp.js publish
-	echo -n "Please open http://localhost:8000/dist/index.html and check if everything works fine." && read -e
-	./node_modules/gulp/bin/gulp.js deploy
+		./node_modules/gulp/bin/gulp.js clean
+		cd dist && git pull origin gh-pages
+		./node_modules/gulp/bin/gulp.js publish
+		echo -n "Please open http://localhost:8000/dist/index.html and check if everything works fine." && read -e
+		cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages
 
 bump:
 	./node_modules/gulp/bin/gulp.js bump
diff --git a/app/js/app.js b/app/js/app.js
index b44afc7f..d90505c7 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -32,6 +32,7 @@ angular.module('myApp', [
   'myApp.directives',
   'myApp.controllers'
 ].concat(extraModules)).config(['$locationProvider', '$routeProvider', '$compileProvider', 'StorageProvider', function ($locationProvider, $routeProvider, $compileProvider, StorageProvider) {
+  $locationProvider.hashPrefix('');
   $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|file|blob|filesystem|chrome-extension|app):|data:image\//)
   $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|file|tg|mailto|blob|filesystem|chrome-extension|app):|data:/)
 
diff --git a/gulpfile.js b/gulpfile.js
index 2eda24e4..9abd93aa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -349,9 +349,4 @@ gulp.task('package', gulp.series('cleanup-dist'))
 
 gulp.task('publish', gulp.series('add-appcache-manifest', 'generate-service-worker'))
 
-gulp.task('deploy', function () {
-  return gulp.src('./dist/**/*')
-    .pipe($.ghPages())
-})
-
 gulp.task('default', gulp.series('build'))
diff --git a/package.json b/package.json
index 4c58f26e..c0295897 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "gulp": "^4.0.2",
     "gulp-angular-templatecache": "^3.0.0",
     "gulp-concat": "^2.1.7",
-    "gulp-gh-pages": "^0.5.4",
     "gulp-grep-stream": "0.0.2",
     "gulp-imagemin": "^5.0.3",
     "gulp-less": "^4.0.1",