diff -u samba-3.2.1/debian/samba-common.dirs samba-3.2.1/debian/samba-common.dirs
--- samba-3.2.1/debian/samba-common.dirs
+++ samba-3.2.1/debian/samba-common.dirs
@@ -5,0 +6 @@
+etc/ufw/applications.d
diff -u samba-3.2.1/debian/samba-common.postinst samba-3.2.1/debian/samba-common.postinst
--- samba-3.2.1/debian/samba-common.postinst
+++ samba-3.2.1/debian/samba-common.postinst
@@ -146,2 +146,6 @@
 
+if [ -x /usr/sbin/ufw ]; then
+        ufw app update --add-new Samba || true
+fi
+
 #DEBHELPER#
diff -u samba-3.2.1/debian/rules samba-3.2.1/debian/rules
--- samba-3.2.1/debian/rules
+++ samba-3.2.1/debian/rules
@@ -182,6 +182,7 @@
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
 	cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
 	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
+	install -m644 debian/samba-common.ufw.profile debian/samba-common/etc/ufw/applications.d/samba-common
 
 	dh_movefiles
 
diff -u samba-3.2.1/debian/samba-common.postrm samba-3.2.1/debian/samba-common.postrm
--- samba-3.2.1/debian/samba-common.postrm
+++ samba-3.2.1/debian/samba-common.postrm
@@ -8,6 +8,8 @@
 	if [ -x "`which ucfr 2>/dev/null`" ]; then
 		ucfr --purge samba-common /etc/samba/smb.conf
 	fi
+	
+	rm -f /etc/ufw/applications.d/samba-common >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#
diff -u samba-3.2.1/debian/control samba-3.2.1/debian/control
--- samba-3.2.1/debian/control
+++ samba-3.2.1/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org>
 Uploaders: Eloy A. Paris <peloy@debian.org>, Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Adam Conrad <adconrad@0c3.net>
-Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616-1), libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], hardening-wrapper
+Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616), libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], hardening-wrapper
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.0
 
@@ -50,6 +50,7 @@
 Architecture: any
 Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<< 3.0.20b-1)
+Suggests: ufw
 Description: Samba common files used by both the server and the client
  The Samba software suite is a collection of programs that
  implements the SMB/CIFS protocol for unix systems, allowing you to serve
diff -u samba-3.2.1/debian/changelog samba-3.2.1/debian/changelog
--- samba-3.2.1/debian/changelog
+++ samba-3.2.1/debian/changelog
@@ -1,3 +1,18 @@
+samba (2:3.2.1-1ubuntu5) intrepid; urgency=low
+
+  * Add ufw integration: 
+    - Created debian/samba-common.ufw.profile
+    - debian/rules:
+      + install profile
+    - samba-common.postinst
+      + Add samba-common profile to ufw
+    - samba-common.postrm:
+      + Remove profile on --purge
+    - debian/control
+      + Suggest ufw
+
+ -- Nicolas Valcárcel <nvalcarcel@ubuntu.com>  Tue, 26 Aug 2008 12:04:18 -0500
+
 samba (2:3.2.1-1ubuntu4) intrepid; urgency=low
 
   * debian/{control,rules}: enable PIE hardening
only in patch2:
unchanged:
--- samba-3.2.1.orig/debian/samba-common.ufw.profile
+++ samba-3.2.1/debian/samba-common.ufw.profile
@@ -0,0 +1,4 @@
+[Samba]
+title=LanManager-like file and printer server for Unix
+description=The Samba software suite is a collection of programs that implements the SMB/CIFS protocol for unix systems, allowing you to serve files and printers to Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred to as the LanManager or NetBIOS protocol.
+ports=137,138/udp|139,445/tcp