diff --git a/debian/changelog b/debian/changelog
index bc2c02d..a8daca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 xbase-clients (1:7.1.ds1-2) unstable; urgency=low
 
   * Add patch by Eugene Konev to fix xdbedizzy crash (closes: #365291).
-  * Drop build-dep on openssh-client | ssh, and set RSH=/usr/bin/ssh when
-    running configure so xsm knows where to find it (closes: #362787).
 
  -- Julien Cristau <julien.cristau@ens-lyon.org>  Fri, 12 Jan 2007 17:54:07 +0100
 
diff --git a/debian/control b/debian/control
index 174db3b..c67c21c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev (>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev (>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh
 Standards-Version: 3.7.2.0
 
 Package: xbase-clients
diff --git a/debian/rules b/debian/rules
index a0412de..61ecfc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,7 @@ build-stamp:
 		             --infodir=\$${prefix}/share/info $(confflags) \
 		             --disable-xprint \
 		             CFLAGS="$(CFLAGS)" \
-			     MANCONF="/etc/manpath.config" \
-			     RSH=/usr/bin/ssh && \
+			     MANCONF="/etc/manpath.config" && \
 		$(MAKE)) || exit 1; \
 	done