diff --git a/macros.in b/macros.in
index 71afa77..12f15c5 100644
--- a/macros.in
+++ b/macros.in
@@ -797,6 +797,21 @@
 #
 %arm	arm armv3l armv4l armv5l armv5tel armv5tejl armv6l armv7l armh
 
+#------------------------------------------------------------------------------
+# arch macro for all E2K processors
+#
+%e2k	e2k e2kv4 e2kv5 e2kv6 e2k4c e2k8c e2k1cp e2k8c2 e2k12c e2k16c e2k2c3
+%_configure_platform_e2kv4 e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2kv5 e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2kv6 e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k4c e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k8c e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k1cp e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k8c2 e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k12c e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k16c e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+%_configure_platform_e2k2c3 e2k-%{_vendor}-%{_target_os}%{_gnueabi}
+
 #------------------------------------------------------------------------
 # Use in %install to generate locale specific file lists. For example,
 #
diff --git a/rpmrc.in b/rpmrc.in
index 4985cce..b87677b 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -26,6 +26,21 @@ optflags: ia32e %optflags_default
 optflags: x86_64 %optflags_default
 optflags: noarch %optflags_default
 
+# mcst suggests -O3 instead of our default -O2; do that uncoditionally
+# !!! changeme for lcc-1.23: -mcpu -> -march !!!
+optflags: e2k %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-v3
+optflags: e2kv4 %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-v4
+optflags: e2kv5 %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-v5
+optflags: e2kv6 %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-v6
+# !!! changeme for lcc-1.23: -mcpu -> -mtune !!!
+optflags: e2k4c %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-4c
+optflags: e2k8c %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-8c
+optflags: e2k1cp %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-1cp
+optflags: e2k8c2 %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-8c2
+optflags: e2k12c %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-12c
+optflags: e2k16c %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-16c
+optflags: e2k2c3 %optflags_core %optflags_warnings -Wno-error %optflags_debug %optflags_optimization -mcpu=elbrus-2c3
+
 # The official RPM starting with 3.0.5 uses -mieee on Alpha by default.
 # We don't as to not kill floating-point performance, but packages which
 # care might want to add that flag themselves.
@@ -155,6 +170,17 @@ arch_canon:	xtensa: xtensa	18
 
 arch_canon:	aarch64: aarch64	19
 
+arch_canon:	e2k: e2k		23
+arch_canon:	e2kv4: e2kv4	23
+arch_canon:	e2kv5: e2kv5	23
+arch_canon:	e2kv6: e2kv6	23
+arch_canon:	e2k4c: e2k4c	23
+arch_canon:	e2k8c: e2k8c	23
+arch_canon:	e2k1cp: e2k1cp	23
+arch_canon:	e2k8c2: e2k8c2	23
+arch_canon:	e2k12c: e2k16c	23
+arch_canon:	e2k2c3: e2k2c3	23
+
 #############################################################
 # Canonical OS names and numbers
 
@@ -264,6 +290,18 @@ arch_compat: i586: i486
 arch_compat: i486: i386
 arch_compat: i386: noarch
 
+arch_compat: e2k12c: e2kv6
+arch_compat: e2k16c: e2kv6
+arch_compat: e2k2c3: e2kv6
+arch_compat: e2kv6: e2kv5
+arch_compat: e2k8c2: e2kv5
+arch_compat: e2kv5: e2kv4
+arch_compat: e2k8c: e2kv4
+arch_compat: e2k1cp: e2kv4
+arch_compat: e2kv4: e2k
+arch_compat: e2k4c: e2k
+arch_compat: e2k: noarch
+
 arch_compat: osfmach3_i686: i686 osfmach3_i586
 arch_compat: osfmach3_i586: i586 osfmach3_i486
 arch_compat: osfmach3_i486: i486 osfmach3_i386
@@ -374,6 +412,18 @@ buildarch_compat: i586: i486
 buildarch_compat: i486: i386
 buildarch_compat: i386: noarch
 
+buildarch_compat: e2k12c: e2kv6
+buildarch_compat: e2k16c: e2kv6
+buildarch_compat: e2k2c3: e2kv6
+buildarch_compat: e2kv6: e2kv5
+buildarch_compat: e2k8c2: e2kv5
+buildarch_compat: e2kv5: e2kv4
+buildarch_compat: e2k8c: e2kv4
+buildarch_compat: e2k1cp: e2kv4
+buildarch_compat: e2kv4: e2k
+buildarch_compat: e2k4c: e2k
+buildarch_compat: e2k: noarch
+
 buildarch_compat: sun4c: noarch
 buildarch_compat: sun4d: noarch
 buildarch_compat: sun4m: noarch