diff --git a/.cvsignore b/.cvsignore
index 1d42e76..52f5a8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 lsb-release-1.4.tar.gz
 redhat-lsb-1.3.tar.bz2
 redhat-lsb-3.0-1.tar.bz2
+redhat-lsb-3.1-1.tar.bz2
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index e54d950..dd3f406 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -1,5 +1,5 @@
 # Define this to link to which library version  eg. /lib64/ld-lsb-x86-64.so.3
-%define lsbsover 3 
+%define lsbsover 3.1 
 
 %ifarch %{ix86}
 %define ldso ld-linux.so.2
@@ -44,11 +44,11 @@
 
 %define upstreamlsbrelver 2.0
 %define lsbrelver 3.0
-%define srcrelease 2
+%define srcrelease 1
 
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
-Version: 3.0
+Version: 3.1
 Release: 10.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
@@ -379,6 +379,12 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/install_initd
 ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
 ln -snf mail $RPM_BUILD_ROOT/bin/mailx
 
+mkdir -p /usr/X11R6/lib/X11/xserver
+ln -snf /usr/%{_lib}/xserver/SecurityPolicy /usr/X11R6/lib/X11/xserver/SecurityPolicy
+mkdir -p /usr/X11R6/lib/X11/fonts/
+ln -snf /usr/share/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc
+ln -snf /usr/share/X11/rgb.txt /usr/X11R6/lib/X11/rgb.txt
+
 gcc -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
 install -m 700 redhat_lsb_trigger.%{_target_cpu} \
@@ -432,9 +438,13 @@ fi
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
-* Thu Jun 22 2006 Lawrence Lim <llim@redhat.com> - 3.0-10.1
-- Attempt to rewrite most part of the mkredhat-lsb to obtain information directly via 
-  specdb rather than sniffing through sgml
+* Thu Jul 6 2006 Lawrence Lim <llim@redhat.com> - 3.1-10.1
+- generate spec file on RHEL5-Alpha system
+- fix vsw4 test suite setup by creating symlink for X11 SecurityPolicy and XFontPath
+
+* Thu Jun 22 2006 Lawrence Lim <llim@redhat.com> - 3.0-10
+- Rewrite most part of the mkredhat-lsb to obtain information directly via specdb 
+  rather than sniffing through sgml
 - remove redundent script and bump up tarball version
 
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.0-9.2
diff --git a/sources b/sources
index 3624b53..dbdb9a0 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 f535414957ea3f7810b098f4ac7e4c50  redhat-lsb-1.3.tar.bz2
 6dc78435cc0837d9d75f7298587787bc  redhat-lsb-3.0-1.tar.bz2
 64518d9c2577e6072df40d7623e22ebc  redhat-lsb-3.0-2.tar.bz2
+443f0f6ddfc0bf591225b2158f75b5a4  redhat-lsb-3.1-1.tar.bz2