diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..13d68fd1fc7fdca9e758d5db887f1b23ee812b77
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,48 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks.git
+    rev: v3.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: trailing-whitespace
+
+  - repo: https://github.com/Yelp/detect-secrets
+    rev: v0.14.3
+    hooks:
+      - id: detect-secrets
+
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.25.0
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/amperser/proselint/
+    rev: 0.10.2
+    hooks:
+      - id: proselint
+        types: [plain-text]
+        exclude: LICENSE
+
+  - repo: https://github.com/executablebooks/mdformat.git
+    rev: 0.5.3
+    hooks:
+      - id: mdformat
+
+  - repo: https://git.shore.co.il/nimrod/shell-pre-commit.git
+    rev: v0.6.0
+    hooks:
+      - id: shell-lint
+
+  - repo: https://github.com/shellcheck-py/shellcheck-py.git
+    rev: v0.7.1.1
+    hooks:
+      - id: shellcheck
+
+  - repo: https://git.shore.co.il/nimrod/docker-pre-commit.git/
+    rev: v0.3.0
+    hooks:
+      - id: hadolint
+      - id: docker-compose
diff --git a/Dockerfile b/Dockerfile
index a8e27e1b25c0397992071323181e62a308acceaa..fc9ddb4e6cc35e7e26e83a88a6c2f5924621bb1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM buildpack-deps:stretch-scm as build
 ARG VERSION=1.0.5
 ENV DEBIAN_FRONTEND noninteractive
+# hadolint ignore=DL3008,DL3015
 RUN apt-get update && \
     apt-get install -y \
         build-essential \
@@ -8,14 +9,14 @@ RUN apt-get update && \
         libpcap-dev \
     && \
     git clone https://github.com/robertdavidgraham/masscan.git --branch ${VERSION} && \
-    cd masscan && \
-    make -j
+    make -jC masscan
 
 FROM debian:stretch-slim
 ARG VERSION=1.0.5
 LABEL MASSCAN_VERSION=${VERSION}
+# hadolint ignore=DL3008
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y libpcap0.8 && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libpcap0.8 && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
 COPY --from=build /masscan/bin/masscan /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/masscan"]
diff --git a/README.md b/README.md
index 302a1423f483b83c09ce3eb4c2ae98421db1634d..ca2ee20bf9ba1456cdbdcf8da71a083cac69052a 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`).
 
 ## Author Information
 
-Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website](
-https://www.shore.co.il/). Patches are welcome via [`git send-email`](
-http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located
-at: <https://git.shore.co.il/explore/>.
+Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my
+[website](https://www.shore.co.il/). Patches are welcome via
+[`git send-email`](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository
+is located at: <https://git.shore.co.il/expore/>.