diff --git a/.env_sample b/.env_sample
new file mode 100644
index 0000000..8be7b34
--- /dev/null
+++ b/.env_sample
@@ -0,0 +1,4 @@
+# -*- mode: shell-script -*-
+export DEPLOY_SSH_USER=insert-remote-username
+export DEPLOY_SSH_HOST=insert-remote-hostname
+export DEPLOY_SSH_PATH=insert-remote-path
diff --git a/Makefile b/Makefile
index e4a12a5..1aae944 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,17 @@
 serve:
-	bundle exec jekyll serve
+	hugo server -D
 
-build:
-	bundle exec jekyll build
+# --minify: works on the final HTML output, not any (CSS, JS) assets
+# see https://gohugo.io/hugo-pipes/bundling/ for the latter
+# Note: as of mid 2021, '--minify' produces broken HTML. Disabled for now.
+build: clean
+	hugo
 
+# requires: source .env
 deploy: build
-	octopress deploy
+	rsync -axv --delete --ignore-errors --exclude .DS_Store --exclude .git public/ $(DEPLOY_SSH_USER)@$(DEPLOY_SSH_HOST):$(DEPLOY_SSH_PATH)
+
+clean:
+	rm -rf public
+
+.PHONY:	serve clean
diff --git a/_config.dev.yml b/_config.dev.yml
deleted file mode 100644
index 2b9cde5..0000000
--- a/_config.dev.yml
+++ /dev/null
@@ -1 +0,0 @@
-baseurl: ""
diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..a18f689
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,3 @@
+baseURL = 'https://rolandjesse.de/'
+languageCode = 'de-DE'
+title = 'Roland Jesse'