2 files changed, 4 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 1d527aa7c..4f1e2e392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ openssh (1:4.2p1-1) UNRELEASED; urgency=low
     - Many bugfixes and improvements to connection multiplexing.
     - Don't pretend to accept $HOME (closes: #208648).
   * debian/rules: Resynchronise CFLAGS with that generated by configure.
+  * openssh-client and openssh-server conflict with pre-split ssh to avoid
+    problems when ssh is left un-upgraded (closes: #324695).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 14 Sep 2005 13:35:17 +0100
 
diff --git a/debian/control b/debian/control
index 8d8f30fe4..3ba6b4606 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Colin Watson <cjwatson@debian.org>
 Package: openssh-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0)
-Conflicts: sftp, rsh-client (<<0.16.1-1), ssh-krb5
+Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5
 Replaces: ssh (<< 1:3.8.1p1-9)
 Suggests: ssh-askpass, xbase-clients
 Provides: rsh-client, ssh-client
@@ -39,7 +39,7 @@ Package: openssh-server
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
-Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5
+Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5
 Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11)
 Suggests: ssh-askpass, xbase-clients, rssh
 Provides: ssh-server