diff --git a/debian/changelog b/debian/changelog
index 439f69ebdd3fd0258bd957b34fd1d831979eb854..9011e6b336e484352a67e677a2c66d68c1642113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-snf-ganeti (2.5.0+ippool+private+rapi-1) stable; urgency=low
+snf-ganeti (2.6.0~beta1+ippool-1) stable; urgency=low
 
   GRNET-specific package against google's master branch
   The package contains google's current master branch +
diff --git a/debian/control b/debian/control
index 9bf4daf888d9af5c8a8a1d9f9226220449f98e17..b8b5d931ee302fb0335b821d1baae2a299a99d13 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Vcs-Browser: https://code.grnet.gr/git/snf-ganeti
 
 Package: snf-ganeti
 Architecture: all
-Conflicts: ganeti, ganeti2
-Replaces: ganeti2
+Conflicts: ganeti, ganeti2, ganeti-htools
+Replaces: ganeti2, ganeti-htools
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
@@ -24,7 +24,7 @@ Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  ganeti-instance-debootstrap, ndisc6, ceph-common
 #Breaks: ganeti-htools (<< 0.3)
 Suggests: drbd8-module-source (>= 8.0.7)
-Provides: ${python:Provides}, ganeti2
+Provides: ${python:Provides}, ganeti2, ganeti-htools
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
  of the Xen virtual machine monitor and other Open Source software. After