diff -Nru dovecot-2.2.24/debian/changelog dovecot-2.2.24/debian/changelog
--- dovecot-2.2.24/debian/changelog	2016-05-09 09:45:11.000000000 +0200
+++ dovecot-2.2.24/debian/changelog	2016-06-30 14:45:02.000000000 +0200
@@ -1,3 +1,9 @@
+dovecot (1:2.2.24-2) unstable; urgency=medium
+
+  * Add ufw profiles for dovecot-imapd and dovecot-pop3d
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 30 Jun 2016 14:35:04 +0200
+
 dovecot (1:2.2.24-1) unstable; urgency=medium
 
   * [26020b6] Imported Upstream version 2.2.24 (Closes: #818652)
diff -Nru dovecot-2.2.24/debian/control dovecot-2.2.24/debian/control
--- dovecot-2.2.24/debian/control	2016-05-09 09:45:11.000000000 +0200
+++ dovecot-2.2.24/debian/control	2016-06-30 14:38:07.000000000 +0200
@@ -69,6 +69,7 @@
 Package: dovecot-imapd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
+Suggests: ufw
 Provides: imap-server
 Description: secure POP3/IMAP server - IMAP daemon
  Dovecot is a mail server whose major goals are security and extreme
@@ -82,6 +83,7 @@
 Package: dovecot-pop3d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
+Suggests: ufw
 Provides: pop3-server
 Description: secure POP3/IMAP server - POP3 daemon
  Dovecot is a mail server whose major goals are security and extreme
diff -Nru dovecot-2.2.24/debian/dovecot-imapd.dirs dovecot-2.2.24/debian/dovecot-imapd.dirs
--- dovecot-2.2.24/debian/dovecot-imapd.dirs	2016-05-09 09:45:11.000000000 +0200
+++ dovecot-2.2.24/debian/dovecot-imapd.dirs	2016-06-30 14:39:00.000000000 +0200
@@ -1,3 +1,4 @@
 usr/lib/dovecot
 usr/lib/dovecot/modules
 usr/share/dovecot/conf.d
+etc/ufw/applications.d
diff -Nru dovecot-2.2.24/debian/dovecot-imapd.ufw.profile dovecot-2.2.24/debian/dovecot-imapd.ufw.profile
--- dovecot-2.2.24/debian/dovecot-imapd.ufw.profile	1970-01-01 01:00:00.000000000 +0100
+++ dovecot-2.2.24/debian/dovecot-imapd.ufw.profile	2016-06-30 14:42:21.000000000 +0200
@@ -0,0 +1,11 @@
+[Dovecot IMAP]
+title=Secure mail server (IMAP)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=143/tcp
+
+[Dovecot Secure IMAP]
+title=Secure mail server (IMAPS)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=993/tcp
diff -Nru dovecot-2.2.24/debian/dovecot-pop3d.dirs dovecot-2.2.24/debian/dovecot-pop3d.dirs
--- dovecot-2.2.24/debian/dovecot-pop3d.dirs	2016-05-09 09:45:11.000000000 +0200
+++ dovecot-2.2.24/debian/dovecot-pop3d.dirs	2016-06-30 14:38:59.000000000 +0200
@@ -1,2 +1,3 @@
 usr/lib/dovecot
 usr/share/dovecot/conf.d
+etc/ufw/applications.d
diff -Nru dovecot-2.2.24/debian/dovecot-pop3d.ufw.profile dovecot-2.2.24/debian/dovecot-pop3d.ufw.profile
--- dovecot-2.2.24/debian/dovecot-pop3d.ufw.profile	1970-01-01 01:00:00.000000000 +0100
+++ dovecot-2.2.24/debian/dovecot-pop3d.ufw.profile	2016-06-30 14:42:28.000000000 +0200
@@ -0,0 +1,11 @@
+[Dovecot POP3]
+title=Secure mail server (POP3)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=110/tcp
+
+[Dovecot Secure POP3]
+title=Secure mail server (POP3S)
+description=Dovecot is a mail server whose major goals are security and extreme
+ reliability.
+ports=995/tcp
diff -Nru dovecot-2.2.24/debian/rules dovecot-2.2.24/debian/rules
--- dovecot-2.2.24/debian/rules	2016-05-09 09:45:11.000000000 +0200
+++ dovecot-2.2.24/debian/rules	2016-06-30 14:40:37.000000000 +0200
@@ -143,6 +143,9 @@
 		| perl -ne '/"(.+)\(.+\)"/ && print $$1' \
 		| tr '[A-Z]' '[a-z]' > $(PKG_DIR:PKG=dev)/usr/share/dovecot/dovecot-abi
 
+	install -m644 debian/dovecot-imapd.ufw.profile debian/dovecot-imapd/etc/ufw/applications.d/dovecot-imapd
+	install -m644 debian/dovecot-pop3d.ufw.profile debian/dovecot-pop3d/etc/ufw/applications.d/dovecot-pop3d
+
 override_dh_installpam:
 	dh_installpam -pdovecot-core --name=dovecot