diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bbc41aff63..78034242ba4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/f90.el (f90-electric-insert): Give it a delete-selection
+	property.  (Bug#5593)
+
 2010-02-18  Sam Steingold  <sds@gnu.org>
 
 	* vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 21273359486..0a3c96d7894 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1356,6 +1356,8 @@ if all else fails."
   (if auto-fill-function (f90-do-auto-fill) ; also updates line
     (f90-update-line)))
 
+;; Behave like self-insert-command for delete-selection-mode (bug#5593).
+(put 'f90-electric-insert 'delete-selection t)
 
 (defun f90-get-correct-indent ()
   "Get correct indent for a line starting with line number.