diff --git a/debian/changelog b/debian/changelog
index 13805e8..e90e8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 postfwd (1.30-1) UNRELEASED; urgency=low
 
   * New upstream release
-   - new parser enhancement is able to omit the trailing "\" for multi-line rules
+   - new parser enhancement is able to omit the trailing "\" for multi-line
+     rules
    - new plugin interface (BETA)
    - Time::HiRes is used if available
    - multiple rate limits for the same items are supported now
@@ -13,7 +14,7 @@ postfwd (1.30-1) UNRELEASED; urgency=low
    - documentation updates and fixes
   * Suppress output on restarting via init script (Closes: #636782), thanks
     Martin F. Krafft for reporting
-  * Ship hapolicy and manpage
+  * Add hapolicy and manpage into separate binary package
   * Reorganize documentation
    - Add new files from upstream to documentation
    - Add 10_hapolicy_manpage.dpatch to have a manpage for hapolicy
diff --git a/debian/control b/debian/control
index f340b80..baadf00 100644
--- a/debian/control
+++ b/debian/control
@@ -19,3 +19,13 @@ Description: Postfix policyd to combine complex restrictions in a ruleset
  message has been accepted. It allows you to choose an action (e.g. reject,
  dunno) for a combination of several smtp parameters (like sender and recipient
  address, size or the client's TLS fingerprint).
+
+Package: hapolicy
+Architecture: all
+Depends: ${perl:Depends}, ${misc:Depends}
+Description: Balancing and fallback postfix policy delegation service
+ Hapolicy enables high availability, weighted loadbalancing and a fallback
+ action for postfix policy delegation services. Invoked via postfix spawn
+ it acts as a wrapper that queries other policy servers via tcp connection.
+ The order of the service queries can be influenced by assigning a specific
+ priority and weight to each service.
diff --git a/debian/hapolicy.docs b/debian/hapolicy.docs
new file mode 100644
index 0000000..120886a
--- /dev/null
+++ b/debian/hapolicy.docs
@@ -0,0 +1,4 @@
+doc/hapolicy.html
+doc/hapolicy.txt
+tools/hapolicy/hapolicy.*
+tools/hapolicy/hapolicy[0-9a-zA-Z.]*
diff --git a/debian/hapolicy.manpages b/debian/hapolicy.manpages
new file mode 100644
index 0000000..e093172
--- /dev/null
+++ b/debian/hapolicy.manpages
@@ -0,0 +1 @@
+man/man8/hapolicy.1
diff --git a/debian/README.Debian b/debian/postfwd.README.Debian
similarity index 100%
rename from debian/README.Debian
rename to debian/postfwd.README.Debian
diff --git a/debian/postfwd.docs b/debian/postfwd.docs
index 310cce4..43e9ffb 100644
--- a/debian/postfwd.docs
+++ b/debian/postfwd.docs
@@ -1,9 +1,6 @@
-#doc/postfwd.html
-#doc/postfwd.txt
 doc/postfwd2.CHANGELOG
 doc/*.html
 doc/*.txt
-tools/hapolicy/hapolicy.*
 tools/*.pl
 tools/*.sample
 plugins/*.sample
diff --git a/debian/postfwd.manpages b/debian/postfwd.manpages
index 2c9c21f..638a3b9 100644
--- a/debian/postfwd.manpages
+++ b/debian/postfwd.manpages
@@ -1,3 +1,2 @@
 debian/tmp/postfwd1.8
 man/man8/postfwd2.8
-man/man8/hapolicy.1
diff --git a/debian/rules b/debian/rules
index a8c064d..9c09d4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,19 +21,19 @@ install: build
 	# install binaries
 	install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd1
 	install -D -m 644 sbin/postfwd2 debian/postfwd/usr/sbin/postfwd2
-	install -D -m 644 tools/hapolicy/hapolicy debian/postfwd/usr/sbin/hapolicy
+	install -D -m 644 tools/hapolicy/hapolicy debian/hapolicy/usr/sbin/hapolicy
 	# install man page
 	mkdir -p debian/tmp/
 	cp man/man8/postfwd.8 debian/tmp/postfwd1.8
-	pod2man debian/postfwd/usr/sbin/hapolicy man/man8/hapolicy.1
+	pod2man debian/hapolicy/usr/sbin/hapolicy man/man8/hapolicy.1
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs doc/postfwd.CHANGELOG
-	dh_installdocs -Xhapolicy
-	dh_installdocs tools/hapolicy/hapolicy[0-9a-zA-Z.]*
+	dh_installdocs -ppostfwd -Xhapolicy
+	dh_installdocs -phapolicy tools/hapolicy/hapolicy[0-9a-zA-Z.]*
 	dh_installexamples etc/postfwd.cf.sample debian/example-cfg*
 	dh_installinit -- defaults 19 21
 	dh_installman