diff --git a/debian/changelog b/debian/changelog
index 5c95fb4e..872ed862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ shadow (1:4.2-1) UNRELEASED; urgency=low
     package containing the new setuid-root binaries newuidmap and newgidmap 
     Set uidmap as priority optional.
   * debian/login.su.pam: Enable pam_limits by default. Closes: #705301
+  * debian/rules: Set default editor to sensible-editor for vipw.
+    Closes: #688252
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 27 Jul 2013 20:07:18 +0200
 
diff --git a/debian/rules b/debian/rules
index ce79a198..12d42443 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,9 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
   DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+# Set the default editor for vipw/vigr
+CFLAGS += -DDEFAULT_EDITOR=\\\"sensible-editor\\\"
+
 # Automatically controls patching at build time:
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk