2 files changed, 9 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index bad06d225..4e4c2a1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:4.3p2-7) UNRELEASED; urgency=low
   [ Colin Watson ]
   * Ignore errors from usermod when changing sshd's shell, since it will
     fail if the sshd user is not local (closes: #398436).
+  * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
+    to avoid unnecessary conffile resolution steps for administrators
+    (thanks, Jari Aalto; closes: #335259).
 
   [ Russ Allbery ]
   * Create transitional ssh-krb5 package which enables GSSAPI configuration
diff --git a/debian/rules b/debian/rules
index 4404c28dd..3e36678da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,6 +165,12 @@ install: build
         install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
         install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen
 
+        # Remove version control tags to avoid unnecessary conffile
+        # resolution steps for administrators.
+        sed -i '/\$$OpenBSD:/' \
+                debian/openssh-client/etc/ssh/moduli \
+                debian/openssh-client/etc/ssh/ssh_config
+
 # Build architecture-independent files here.
 binary-indep: binary-ssh binary-ssh-krb5