diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index f0b0379a0a..c9944be23c 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -96,7 +96,7 @@ Source: "wxPython\lib\colourchooser\*.py";  DestDir: "{app}\wxPython\lib\colourc
 Source: "wxPython\py\*.py";                 DestDir: "{app}\wxPython\py"; Components: core
 Source: "wxPython\py\*.txt";                DestDir: "{app}\wxPython\py"; Components: core
 Source: "wxPython\py\*.ico";                DestDir: "{app}\wxPython\py"; Components: core
-Source: "wxPython\py\Py.ico";               DestDir: "{app}\wxPython\py"; DestName: "PyCrust.ico"; Components: core
+Source: "wxPython\py\PyCrust.ico";          DestDir: "{app}\wxPython\py"; Components: core
 Source: "wxPython\py\tests\*.py";           DestDir: "{app}\wxPython\py\tests"; Components: core
 Source: "wxPython\py\wxd\*.py";             DestDir: "{app}\wxPython\py\wxd"; Components: core
 
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 9a8848842d..aeed61ea57 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -47,7 +47,6 @@ Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix:    %{pref}
-#BuildRequires: %{python}
 
 Provides: wxPython  = %{version}
 Provides: wxPython%{port}  = %{version}
@@ -58,7 +57,6 @@ Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so
 Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
 
 
-
 # old wxPython packages
 Obsoletes: wxPython wxPython%{port}
 
@@ -138,8 +136,6 @@ cd $WXDIR/wxPython
 	WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build" \
 	build
 
-##	WX_CONFIG="$WXDIR/build/wx-config --inplace --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-
 
 
 # Build wxrc (XRC resource tool) but don't use the makefiles since they expect
@@ -149,7 +145,7 @@ WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build"
 wCC=`$WX_CONFIG --cc`
 wCXX=`$WX_CONFIG --cxx`
 
-for f in wxrc.cpp ../../src/xrc/*.cpp; do
+for f in wxrc.cpp ../../src/xrc/xml.cpp ../../src/xrc/xmlres.cpp; do
     echo $f
     $wCXX `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f
 done
@@ -158,9 +154,6 @@ for f in ../../src/xrc/expat/xmlparse/xmlparse.c ../../src/xrc/expat/xmltok/xmlr
     $wCC `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f
 done
 
-# the handlers are not needed
-rm xh_*.o xmlrsall.o
-
 $wCXX `$WX_CONFIG --libs` *.o -o wxrc
 strip wxrc
 
@@ -214,6 +207,35 @@ done
 cp $WXDIR/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT/%{pref}/bin
 
 
+# Copy icons and make menu entries
+mkdir -p $RPM_BUILD_ROOT/%{_iconsdir}
+mkdir -p $RPM_BUILD_ROOT/%{_miconsdir}
+mkdir -p $RPM_BUILD_ROOT/%{_menudir}
+install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT/%{_iconsdir}/PyCrust.png
+install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT/%{_miconsdir}/PyCrust.png
+install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT/%{_iconsdir}/XRCed.png
+install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT/%{_miconsdir}/XRCed.png
+
+cat > $RPM_BUILD_ROOT/%{_menudir}/%{name} <<EOF
+?package(%{name}): command="%_bindir/pyshell" needs="X11" \
+icon="PyCrust.png" section="Applications/Development" \
+title="PyShell" longtitle="Python Shell"
+
+?package(%{name}): command="%_bindir/pycrust" needs="X11" \
+icon="PyCrust.png" section="Applications/Development" \
+title="PyCrust" longtitle="Python Shell with Filling"
+
+?package(%{name}): command="%_bindir/pyalamode" needs="X11" \
+icon="PyCrust.png" section="Applications/Development" \
+title="PyAlaMode" longtitle="Python Shell with Filling and editor windows"
+
+?package(%{name}): command="%_bindir/xrced" needs="X11" \
+icon="XRCed.png" section="Applications/Development" \
+title="XRCed" longtitle="wxPython XRC resource editor"
+
+EOF
+
+
 # Generate the filelists.  For some reason the %defattr below is still
 # resulting in many (but not all) files not owned by root when just
 # specifying directories and wildcards to be included in each package.
@@ -231,6 +253,8 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> FILELIST
 $GFL    $RPM_BUILD_ROOT %{wxpref}/lib              >> FILELIST
 $GFL    $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*"     >> FILELIST
 $GFL -r $RPM_BUILD_ROOT %{wxpref}/share            >> FILELIST
+#GFL -r $RPM_BUILD_ROOT %{_iconsdir}               >> FILELIST
+$GFL -r $RPM_BUILD_ROOT %{_menudir}                >> FILELIST
 
 $GFL    $RPM_BUILD_ROOT %{wxpref}/include           > DEVELLIST
 $GFL -r $RPM_BUILD_ROOT %{wxpref}/include/wx       >> DEVELLIST
@@ -239,6 +263,13 @@ $GFL    $RPM_BUILD_ROOT %{wxconfigname}            >> DEVELLIST
 $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 
 
+#----------------------------------------------------------------
+%post
+%{update_menus}
+
+%postun
+%{clean_menus}
+
 #----------------------------------------------------------------
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
diff --git a/wxPython/wxPython/py/PyCrust.ico b/wxPython/wxPython/py/PyCrust.ico
new file mode 100644
index 0000000000..eae6180e10
Binary files /dev/null and b/wxPython/wxPython/py/PyCrust.ico differ
diff --git a/wxPython/wxPython/py/PyCrust_16.png b/wxPython/wxPython/py/PyCrust_16.png
new file mode 100644
index 0000000000..1abc97df90
Binary files /dev/null and b/wxPython/wxPython/py/PyCrust_16.png differ
diff --git a/wxPython/wxPython/py/PyCrust_32.png b/wxPython/wxPython/py/PyCrust_32.png
new file mode 100644
index 0000000000..0496f5f515
Binary files /dev/null and b/wxPython/wxPython/py/PyCrust_32.png differ
diff --git a/wxPython/wxPython/tools/XRCed/XRCed_16.png b/wxPython/wxPython/tools/XRCed/XRCed_16.png
new file mode 100644
index 0000000000..e47a565a06
Binary files /dev/null and b/wxPython/wxPython/tools/XRCed/XRCed_16.png differ
diff --git a/wxPython/wxPython/tools/XRCed/XRCed_32.png b/wxPython/wxPython/tools/XRCed/XRCed_32.png
new file mode 100644
index 0000000000..33e1908b6f
Binary files /dev/null and b/wxPython/wxPython/tools/XRCed/XRCed_32.png differ