diff --git a/debian/changelog b/debian/changelog
index c1d207a..008f4f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+db (5.1.25-2) unstable; urgency=low
+
+  * Adopt the package (Closes: #619907)
+  * Build-depend on Debian default tcl-dev
+  * Move libdb-java, libdb-java-dev and libdb++-dev to empty packages
+    built from db-defaults
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 13 Apr 2011 21:59:34 +0200
+
 db (5.1.25-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 9e063ed..00c048f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: db
 Section: libs
 Priority: standard
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Debian Berkeley DB Group <pkg-db-devel@alioth.debian.org>
+Uploaders: Ondřej Surý <ondrej@debian.org>
 Standards-Version: 3.9.1
-Build-Depends: tcl8.5-dev, procps [!hurd-i386], default-jdk-builddep [!hppa !hurd-i386 !m32r !avr32]
+Build-Depends: tcl-dev, procps [!hurd-i386], default-jdk-builddep [!hppa !hurd-i386 !m32r !avr32]
 Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
-Vcs-Browser: http://git.debian.org/?p=users/clint/db.git;a=summary
-Vcs-Git: git://git.debian.org/git/users/clint/db.git
+Vcs-Browser: http://git.debian.org/?p=pkg-db/db.git;a=summary
+Vcs-Git: git://git.debian.org/git/pkg-db/db.git
 
 Package: db5.1-doc
 Architecture: all
@@ -72,8 +73,6 @@ Description: Berkeley v5.1 Database Libraries for C++ [runtime]
 
 Package: libdb5.1++-dev
 Architecture: any
-Provides: libdb++-dev
-Conflicts: libdb++-dev
 Section: libdevel
 Priority: extra
 Depends: libdb5.1++ (= ${binary:Version}), libdb5.1-dev (= ${binary:Version})
@@ -105,8 +104,6 @@ Package: libdb5.1-java
 Architecture: any
 Section: java
 Priority: optional
-Provides: libdb-java
-Conflicts: libdb-java
 Depends: ${shlibs:Depends}
 Recommends: libdb5.1-java-gcj
 Description: Berkeley v5.1 Database Libraries for Java
@@ -128,8 +125,6 @@ Package: libdb5.1-java-dev
 Architecture: any
 Section: libdevel
 Priority: optional
-Provides: libdb-java-dev
-Conflicts: libdb-java-dev
 Depends: ${shlibs:Depends}, libdb5.1-java
 Description: Berkeley v5.1 Database Libraries for Java [development]
  This package provides the Java interface for the Berkeley v5.1 database
