diff -ur a/cipher/Makefile.am b/cipher/Makefile.am
--- a/cipher/Makefile.am	2009-12-11 07:31:38.000000000 -0800
+++ b/cipher/Makefile.am	2016-04-30 14:20:30.248224774 -0700
@@ -68,7 +68,7 @@
 camellia.c camellia.h camellia-glue.c
 
 if ENABLE_O_FLAG_MUNGING
-o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g'
+o_flag_munging = sed -e 's/ -O[2-9s]* / -O1 /g'
 else
 o_flag_munging = cat
 endif
diff -ur a/cipher/Makefile.in b/cipher/Makefile.in
--- a/cipher/Makefile.in	2010-07-13 08:42:20.000000000 -0700
+++ b/cipher/Makefile.in	2016-04-30 14:20:12.812002856 -0700
@@ -274,7 +274,7 @@
 camellia.c camellia.h camellia-glue.c
 
 @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g'
+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/ -O[2-9s]* / -O1 /g'
 all: all-am
 
 .SUFFIXES: