diff --git a/defaults/main.yml b/defaults/main.yml
index 97a8d34..8180214 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,7 +20,9 @@ cups_admin_users:
 cups_bind_url:
   - localhost:631
 
-cups_listen_address: print.example.org
+
+cups_server_name: print.example.org
+cups_server_alias: "{{ cups_server_name }}"
 
 cups_log_level: warn
 cups_server_admin: admin@example.com
diff --git a/templates/etc/cups/cupsd.conf.j2 b/templates/etc/cups/cupsd.conf.j2
index e933375..7ab344d 100644
--- a/templates/etc/cups/cupsd.conf.j2
+++ b/templates/etc/cups/cupsd.conf.j2
@@ -5,6 +5,7 @@
 #
 
 ServerAdmin {{ cups_server_admin }}
+ServerName {{ cups_server_name }}
 ServerAlias {{ cups_listen_address }}
 DefaultEncryption Never