diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4217ba1112..1f6b7d3dfaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-12  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+	* textmodes/flyspell.el (flyspell-large-region): For hunspell, use
+	'("-i" ENCODING), in 2 separate command-line arguments, to specify
+	the encoding, as expected by hunspell.
+
 2012-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* battery.el (battery--linux-sysfs-regexp): New const.
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 24967ded154..72a3eb474f8 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1576,10 +1576,11 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
       (if ispell-encoding8-command
 	  (setq args
 		(append args
-			(list
-			 (concat ispell-encoding8-command
-				 (symbol-name
-				  encoding))))))
+			(if ispell-really-hunspell
+			    (list ispell-encoding8-command
+				  (upcase (symbol-name encoding)))
+			  (list (concat ispell-encoding8-command
+					(symbol-name encoding)))))))
 
       (let ((process-coding-system-alist (list (cons "\\.*" encoding))))
 	(setq c (apply 'ispell-call-process-region beg