diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 4f23fed66..db86fffab 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -10,6 +10,7 @@
  - cleanup of tcp_wrappers.conf
  - Alejandro Mery: updated lvs->ipvsadm, keepalived
  - Miguel Bolanos: substituted "Ultra SPARC" with "UltraSPARC"
+                   Alpha optimisations selection
 
 *) 2003-12-17 (2.0.0-rc3 - 2.0.0-rc4)
 
diff --git a/architecture/alpha/config.hlp b/architecture/alpha/config.hlp
new file mode 100644
index 000000000..8c399fcc8
--- /dev/null
+++ b/architecture/alpha/config.hlp
@@ -0,0 +1,28 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/architecture/alpha/config.hlp
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+ROCKCFG_ALPHA_OPT
+  Please select the specific type of alpha-CPU you want to optimise
+  binaries for.
+  You can also choose to not optimise for any specific CPU. The resulting
+  binaries will run on any alpha-compatible CPU but with a significant loss
+  in performance.
diff --git a/architecture/alpha/config.in b/architecture/alpha/config.in
new file mode 100644
index 000000000..b45d15179
--- /dev/null
+++ b/architecture/alpha/config.in
@@ -0,0 +1,36 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/architecture/alpha/config.in
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+choice ROCKCFG_ALPHA_OPT generic \
+	generic		"No special optimisation"	\
+	ev4		"Optimised for EV4 CPU"		\
+	ev45		"Optimised for EV4.5 CPU"	\
+	ev5		"Optimised for EV5 CPU"		\
+	ev56		"Optimised for EV5.6 CPU"	\
+	pca56		"Optimised for PCA5.6 CPU"	\
+	ev6		"Optimised for EV6 CPU"		\
+	ev67		"Optimised for EV6.7 CPU"
+
+if [ $ROCKCFG_ALPHA_OPT != generic ] ; then
+	ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_ALPHA_OPT"
+fi
+
diff --git a/architecture/alpha/gcc-options b/architecture/alpha/gcc-options
new file mode 100644
index 000000000..b048a6fb6
--- /dev/null
+++ b/architecture/alpha/gcc-options
@@ -0,0 +1,5 @@
+
+if [ $ROCKCFG_ALPHA_OPT != generic ] ; then
+	var_append GCC3_WRAPPER_INSERT " " \
+		"-mtune=$ROCKCFG_ALPHA_OPT"
+fi