diff --git a/CONTRIBUTING b/CONTRIBUTING
index 6fb76a56c08d0699dc4f69318552d7ef0f5b3de8..9fbda15372619b4c9c4a4b90701390e832e1dd1b 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -82,7 +82,7 @@ Visit https://code.eliotberriot.com/funkwhale/funkwhale and clone the repository
 A note about branches
 ^^^^^^^^^^^^^^^^^^^^^
 
-Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefor, when submitting Merge Requests, ensure you are merging on the develop branch.
+Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefore, when submitting Merge Requests, ensure you are merging on the develop branch.
 
 
 Working with docker
diff --git a/changes/changelog.d/typos.doc b/changes/changelog.d/typos.doc
new file mode 100644
index 0000000000000000000000000000000000000000..51cc5e8c4fd08c4f4d1997df983474c13704d6e2
--- /dev/null
+++ b/changes/changelog.d/typos.doc
@@ -0,0 +1 @@
+Fixed a couple of typos
diff --git a/deploy/apache.conf b/deploy/apache.conf
index 5f86db7bd533846577dc6ae140249b1239a4387e..b74e04b33387a265b730d7d58a315ca4b95079b0 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -34,7 +34,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
    # TLS
    # Feel free to use your own configuration for SSL here or simply remove the
    # lines and move the configuration to the previous server block if you
-   # don't want to run funkwhale behind https (this is not recommanded)
+   # don't want to run funkwhale behind https (this is not recommended)
    # have a look here for let's encrypt configuration:
    # https://certbot.eff.org/lets-encrypt/debianstretch-apache.html
    SSLEngine on
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
index c8f64cc384eb14cb4fb15dd4d0a1c42c716fb8b2..2d8412edb45a0f828f844af0553cc85b300e8cae 100644
--- a/deploy/nginx.conf
+++ b/deploy/nginx.conf
@@ -31,7 +31,7 @@ server {
     # TLS
     # Feel free to use your own configuration for SSL here or simply remove the
     # lines and move the configuration to the previous server block if you
-    # don't want to run funkwhale behind https (this is not recommanded)
+    # don't want to run funkwhale behind https (this is not recommended)
     # have a look here for let's encrypt configuration:
     # https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx
     ssl_protocols TLSv1.2;