diff --git a/Makefile.PL b/Makefile.PL
index c6c3628..038b230 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -301,7 +301,7 @@ WriteMakefile(
 	# this change broke a test under some environment, and thus, may
 	# break other applications eventually. I'm not sure if this is
 	# worth the trouble.
-	OPTIMIZE => '-O2',
+	OPTIMIZE => $Config{optimize} . (($^O eq 'solaris' and !$Config{gccversion}) ? "" : " -O2"),
 	OPTIONAL( '6.48',
 		MIN_PERL_VERSION => '5.006',
 	),