diff --git a/debian/changelog b/debian/changelog
index 4f040083..f1760b97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libgtop2 (2.26.1-1) UNRELEASED; urgency=low
+libgtop2 (2.26.1-1) unstable; urgency=low
 
+  [ Luca Bruno ]
   * New upstream release.
   * debian/copyright:
     - Specify GPL version 2.
@@ -9,7 +10,13 @@ libgtop2 (2.26.1-1) UNRELEASED; urgency=low
     - Updated Standards-Version to 3.8.1, no additional changes needed.
     - Add ${misc:Depends} to all packages.
 
- -- Luca Bruno <lethalman88@gmail.com>  Sun, 17 May 2009 13:31:15 +0200
+  [ Josselin Mouette ]
+  * Fix incorrect Replaces:.
+  * Remove the FreeBSD-specific libraries from the -dev dependencies, 
+    they are not needed to build libgtop2-based applications.
+  * Add missing build-dependencies.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 11 Jun 2009 09:15:19 +0200
 
 libgtop2 (2.24.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 483a7f8d..78fb46d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
                gettext,
                pkg-config,
@@ -13,15 +13,17 @@ Build-Depends: debhelper (>= 5),
                texinfo,
                dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
+               libxt-dev,
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.8.0
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
+Standards-Version: 3.8.1
 
 Package: libgtop2-7
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
@@ -32,9 +34,9 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${os-specific-dev}
+Depends: ${misc:Depends},
+         libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -45,6 +47,7 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
+Depends: ${misc:Depends},
 Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,
diff --git a/debian/control.in b/debian/control.in
index 7b96e019..b8bbe918 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,9 +13,11 @@ Build-Depends: debhelper (>= 5),
                texinfo,
                dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
+               libxt-dev,
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
 Standards-Version: 3.8.1
 
 Package: libgtop2-7
@@ -34,8 +36,7 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${os-specific-dev}
+         libglib2.0-dev
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -46,8 +47,8 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
-Replaces: ${misc:Depends},
-          libgtop2-5,
+Depends: ${misc:Depends},
+Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,
           libgtop2
diff --git a/debian/rules b/debian/rules
index 68c286f3..9a1df725 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,3 @@ GNOME_MODULE := libgtop
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)'
-
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev"
-endif
-