diff --git a/wxPython/distrib/genfilelist.py b/wxPython/distrib/genfilelist.py
index db2cb0b9c1..20760b36d9 100644
--- a/wxPython/distrib/genfilelist.py
+++ b/wxPython/distrib/genfilelist.py
@@ -7,7 +7,7 @@ Usage:  genfilelist.py [-r] build_root filespec(s)
 """
 
 
-import sys, os, glob
+import sys, os, glob, stat
 
 
 def walktree(names, buildroot, recurse):
@@ -25,7 +25,7 @@ def printfilename(name, buildroot, isdir):
         fmt = "%%dir %%attr(%o, root, root) %s"
     else:
         fmt = "%%attr(%o, root, root) %s"
-    print fmt % (s.st_mode & 0777, realname)
+    print fmt % (s[stat.ST_MODE] & 0777, realname)
 
 
 def main(args):
diff --git a/wxPython/distrib/makedemo b/wxPython/distrib/makedemo
index 4cc6c737da..af2983ee31 100755
--- a/wxPython/distrib/makedemo
+++ b/wxPython/distrib/makedemo
@@ -21,7 +21,7 @@ cp -R samples _distrib_tgz/wxPython-$1
 rm -rf `find _distrib_tgz/wxPython-$1 -name CVS`
 rm -f `find  _distrib_tgz/wxPython-$1 -name "*.pyc"`
 rm -f `find  _distrib_tgz/wxPython-$1 -name .cvsignore`
-rm -f `find  _distrib_tgz/wxPython-$1 -name core`
+rm -f `find  _distrib_tgz/wxPython-$1 -name "core*"`
 rm -f `find  _distrib_tgz/wxPython-$1 -name wxPython`
 rm -f `find  _distrib_tgz/wxPython-$1 -name "*.o"`
 rm -f `find  _distrib_tgz/wxPython-$1 -name "*.so"`
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 5c3ad6175e..853c329d96 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -144,6 +144,7 @@ cd $WXDIR/wxPython
 
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 for s in \
+	helpviewer \
 	img2png \
 	img2py \
 	img2xpm \