diff --git a/Makefile b/Makefile
index 52a9856..dd663f3 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ SCREENSAVER =
 
 DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
 DISTROICON = $(DISTROid)
+ARCH=`uname -i`
 
 DESTDIR =
 
@@ -96,9 +97,11 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
 .SUFFIXES: .in .po .mo
 
 .in:; @echo "generating $@..."; \
+       [ "$(ARCH)" != "x86_64" ] && ARCH=i386; \
        sed "s,@distroID@,$(DISTROID),g;\
             s,@distroid@,$(DISTROid),g;\
             s,@distroicon@,$(DISTROICON),g;\
+            s,@arch@,$(ARCH),g;\
             s,@distribution@,$(RPM_DISTRIBUTION),g;\
             s,@distroext@,$(RPM_DISTROEXT),g;\
             s,@vendor@,$(RPM_VENDOR),g;\
diff --git a/SRPMS/flashplugin/distroutils.sysconfig b/SRPMS/flashplugin/distroutils.sysconfig.in
similarity index 80%
rename from SRPMS/flashplugin/distroutils.sysconfig
rename to SRPMS/flashplugin/distroutils.sysconfig.in
index 232d635..4160662 100644
--- a/SRPMS/flashplugin/distroutils.sysconfig
+++ b/SRPMS/flashplugin/distroutils.sysconfig.in
@@ -1,7 +1,7 @@
 ## Adobe Flash Plugin
 
 # package name (do not modify unless you know what you're doing)
-FLASH_PLUGIN_PCK=install_flash_player_11_linux_i386.tar.gz
+FLASH_PLUGIN_PCK=install_flash_player_11_linux_@arch@.tar.gz
 
 # package URL (do not modify unless you know what you're doing)
 FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/