diff --git a/VERSION.txt b/VERSION.txt
index ee90284..90a27f9 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.0.4
+1.0.5
diff --git a/ceod/model/MailService.py b/ceod/model/MailService.py
index 88f0f36..99f62bd 100644
--- a/ceod/model/MailService.py
+++ b/ceod/model/MailService.py
@@ -24,7 +24,12 @@ class MailService:
             raise Exception('Invalid SMTP URL: %s' % smtp_url)
         self.smtps = match.group('scheme') == 'smtps'
         self.host = match.group('host')
-        self.port = int(match.group('port') or 25)
+        if match.group('port') is not None:
+            self.port = int(match.group('port'))
+        elif self.smtps:
+            self.port = 465
+        else:
+            self.port = 25
         self.starttls = cfg.get('mail_smtp_starttls')
         assert not (self.smtps and self.starttls)
         self.base_domain = cfg.get('base_domain')
diff --git a/debian/changelog b/debian/changelog
index aabaca5..044ee04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceo (1.0.5-buster1) buster; urgency=medium
+
+  * Use port 465 for smtps.
+
+ -- Max Erenberg <merenber@csclub.uwaterloo.ca>  Tue, 02 Nov 2021 06:22:24 +0000
+
 ceo (1.0.4-buster1) buster; urgency=high
 
   * Use pip install . instead of python setup.py install
diff --git a/setup.py b/setup.py
index ee3a488..c3a4ee5 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
     ],
     license='MIT',
     keywords='csc, syscom, admin, ldap, kerberos',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests.*', 'tests']),
     python_requires='>=3.7',
     install_requires=requirements,
     tests_require=test_requirements,