diff --git a/net-snmp-config b/net-snmp-config
index 57fb9f9..a6ba34a 100755
--- a/net-snmp-config
+++ b/net-snmp-config
@@ -11,7 +11,7 @@
 # this particular shell script calls arch specific script to avoid
 # multilib conflicts
 
-# Supported arches ix86 ia64 ppc ppc64 s390 s390x x86_64
+# Supported arches ix86 ia64 ppc ppc64 s390 s390x x86_64 alpha
 
 arch=`arch`
 echo $arch | grep -q i.86
@@ -43,5 +43,9 @@ if [ "$arch" = "x86_64" ] ; then
     net-snmp-config-x86_64 $*
     exit 0
 fi
+if [ "$arch" = "alpha" ] ; then
+    net-snmp-config-alpha $*
+    exit 0
+fi
 
 echo "Cannot determine architecture"
diff --git a/net-snmp-config.h b/net-snmp-config.h
index a260d51..1ec086f 100644
--- a/net-snmp-config.h
+++ b/net-snmp-config.h
@@ -23,6 +23,8 @@
 #include "net-snmp-config-s390.h"
 #elif defined(__x86_64__)
 #include "net-snmp-config-x86_64.h"
+#elif defined(__alpha__)
+#include "net-snmp-config-alpha.h"
 #else
 #error "net-snmp-devel package does not work on your architecture"
 #endif
diff --git a/net-snmp.spec b/net-snmp.spec
index 13b03fb..4d0f4b9 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -377,10 +377,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
 * Mon Jul 30 2007  Safranek <jsafranek@redhat.com> 5.4-16
-- lm_sensors now supported on ppc64 (#249255)
+- supported lm_sensors on ppc64 (#249255)
 - snmpconf generates config files with proper selinux context
   (#247462)
-- fixed leak  in udp transport (#247771)
+- fix leak  in udp transport (#247771)
+- add alpha to supported archs in net-snmp-config (#246825)
 
 * Thu Jun 28 2007 Jan Safranek <jsafranek@redhat.com> 5.4-15
 - fix default snmptrapd.conf