diff --git a/email_headers/models/mail.py b/email_headers/models/mail.py
index 0d878b8..5c6de6e 100644
--- a/email_headers/models/mail.py
+++ b/email_headers/models/mail.py
@@ -135,15 +135,25 @@ class MailServer(models.Model):
         "In-Reply-To headers.",
     )
 
-    force_email_reply_to = fields.Char("Force Reply-To Address",)
+    force_email_reply_to = fields.Char(
+        "Force Reply-To Address",
+    )
 
-    force_email_reply_to_name = fields.Char("Force Reply-To Name",)
+    force_email_reply_to_name = fields.Char(
+        "Force Reply-To Name",
+    )
 
-    force_email_reply_to_domain = fields.Char("Force Reply-To Domain",)
+    force_email_reply_to_domain = fields.Char(
+        "Force Reply-To Domain",
+    )
 
-    force_email_from = fields.Char("Force From Address",)
+    force_email_from = fields.Char(
+        "Force From Address",
+    )
 
-    force_email_sender = fields.Char("Force Sender Address",)
+    force_email_sender = fields.Char(
+        "Force Sender Address",
+    )
 
     prioritize_reply_to_over_msgid = fields.Boolean(
         "Prioritize Reply-To Over Email Headers",
@@ -156,7 +166,9 @@ class MailServer(models.Model):
     )
 
     headers_example = fields.Text(
-        "Example Headers", compute="_compute_headers_example", store=False,
+        "Example Headers",
+        compute="_compute_headers_example",
+        store=False,
     )
 
     # TODO Implement field input validators
@@ -266,7 +278,10 @@ class MailServer(models.Model):
                 # Find or create an email alias
                 alias = self.find_or_create_alias(force_email_from.split("@"))
                 # noinspection PyProtectedMember
-                reply_to = mail_server._get_reply_to_address(alias, original_from_name,)
+                reply_to = mail_server._get_reply_to_address(
+                    alias,
+                    original_from_name,
+                )
                 del message["Reply-To"]
                 message["Reply-To"] = reply_to
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f59d9ca
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+Crypto.Cipher.AES
diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore
new file mode 100644
index 0000000..207e615
--- /dev/null
+++ b/setup/.setuptools-odoo-make-default-ignore
@@ -0,0 +1,2 @@
+# addons listed in this file are ignored by
+# setuptools-odoo-make-default (one addon per line)
diff --git a/setup/README b/setup/README
new file mode 100644
index 0000000..a63d633
--- /dev/null
+++ b/setup/README
@@ -0,0 +1,2 @@
+To learn more about this directory, please visit
+https://pypi.python.org/pypi/setuptools-odoo
diff --git a/setup/email_headers/odoo/addons/email_headers b/setup/email_headers/odoo/addons/email_headers
new file mode 120000
index 0000000..a5d9cb7
--- /dev/null
+++ b/setup/email_headers/odoo/addons/email_headers
@@ -0,0 +1 @@
+../../../../email_headers
\ No newline at end of file
diff --git a/setup/email_headers/setup.py b/setup/email_headers/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/email_headers/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)