diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4f9cefda0776745d43e853a665614dfb02c4c45e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.iml
+/.idea/*
+!/.idea/copyright/
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..a7e4614c4fe6544a854df2af2fa46089eefe19be
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,23 @@
+ARG VERSION=5.7
+
+FROM openjdk:16-slim-buster AS builder
+
+RUN apt-get update && \
+    apt-get install -y wget unzip git build-essential && \
+    rm -rf /var/lib/apt/lists/*
+RUN git clone https://github.com/facebookresearch/fastText.git && \
+    cd fastText && \
+    make
+ARG VERSION
+RUN wget https://www.languagetool.org/download/LanguageTool-$VERSION.zip && \
+    unzip LanguageTool-$VERSION.zip && \
+    rm LanguageTool-$VERSION.zip
+
+FROM openjdk:16-slim-buster
+ARG VERSION
+COPY --from=builder /LanguageTool-$VERSION /languagetool
+COPY --from=builder /fastText/fasttext /languagetool/fasttext
+
+WORKDIR /languagetool
+
+ENTRYPOINT [ "java", "-cp", "languagetool-server.jar", "org.languagetool.server.HTTPServer" ]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..59abd11d0721c92bc997498ee3befdaa5278b83d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+VERSION := 5.7
+IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git)
+TAGS := $(shell git describe --always --tags HEAD)
+
+.PHONY: build
+build:
+	docker build --pull -t $(IMAGE):$(TAGS) --build-arg VERSION=$(VERSION) .
+	docker tag $(IMAGE):$(TAGS) $(IMAGE):latest
+	@echo Successfully tagged $(IMAGE):$(TAGS) as latest
+
+.PHONY: push
+push: build
+	docker push $(IMAGE):$(TAGS)
+	docker push $(IMAGE):latest
+	@echo Successfully pushed $(IMAGE):$(TAGS) as latest