diff --git a/Makefile.am b/Makefile.am
index e76b2049040eb393b6e4522ced791b2492f1cb8c..fac7651fecef5b5e7add3f1934e089d851edf917 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,4 +228,4 @@ $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl
 	$(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
 # For autoconf-modified sources (e.g., armopts.s)
 %-gnu.S: %.s
-	$(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@
+	$(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
diff --git a/celt/arm/arm2gnu.pl b/celt/arm/arm2gnu.pl
index 54f7129be01880041fe3cb40eabf5581a2843a13..6c922ac819d7e0889bdbb72c4e8bec9cf6be5d4b 100755
--- a/celt/arm/arm2gnu.pl
+++ b/celt/arm/arm2gnu.pl
@@ -36,12 +36,12 @@ eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
 
 while ($ARGV[0] =~ /^-/) {
     $_ = shift;
-  last if /^--/;
-    if (/^-n/) {
+  last if /^--$/;
+    if (/^-n$/) {
     $nflag++;
     next;
     }
-    if (/^--apple/) {
+    if (/^--apple$/) {
         $apple = 1;
         $symprefix = "_";
         next;