diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index cbd77a7bb0..b7d5f80a95 100755
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -14,13 +14,13 @@ fi
 # Initialization
 
 distdir=`pwd`/dist
-builddir=`pwd`/build_rpm
+builddir=`pwd`/_build_rpm
 rpmtop=${builddir}/rpmtop
 cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/home/wxcvs
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
-tarname=wxPythonFull
+tarname=wxPythonSrc
 debug=0
 
 
@@ -54,6 +54,8 @@ version=$2
 pyver=$3
 shift;shift;shift
 
+tarver=${tarname}-${version}
+
 
 python=${pythonbin}${pyver}
 if [ ! -e ${python} ]; then
@@ -71,6 +73,7 @@ function makespec {
 	| sed s:@PORT@:${port}:g \
 	| sed s:@LCPORT@:${lcport}:g \
 	| sed s:@TARNAME@:${tarname}:g \
+	| sed s:@VERSION@:${version}:g \
 	> ${distdir}/wxPython${port}.spec
 }
 
@@ -93,8 +96,6 @@ for flag in $*; do
 done
 
 
-tarver=${tarname}-${version}
-
 #----------------------------------------------------------------------
 # Setup build dirs
 
@@ -152,12 +153,11 @@ fi
 
 
 #----------------------------------------------------------------------
-# Make the spec file and copy to ${builddir}/${tarver}
+# Make the spec file and copy to ${builddir}/${tarver} so it will be
+# in the tar file when it's built
 
-#if [ -z "${skiptar}" ]; then
-    makespec
-    cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
-#fi
+makespec
+cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
 
 
 #----------------------------------------------------------------------
@@ -190,6 +190,7 @@ if [ -z "${skiprpm}" ]; then
 	echo "*** RPM failure, exiting."
 	exit 1
     else
+	echo "*** Moving RPMs to ${distdir}"
 	mv -f `find ${rpmtop} -name "wxPython*.rpm"` ${distdir}
     fi
 fi
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 0ff41979a5..326a695f4f 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -1,18 +1,20 @@
-%define pref %{_prefix}
-%define python @PYTHON@
-%define pyver @PYVER@
-%define debug @DEBUG@
-%define port  @PORT@
-%define lcport @LCPORT@
+%define pref 	%{_prefix}
+%define python 	@PYTHON@
+%define pyver 	@PYVER@
+%define debug 	@DEBUG@
+%define port  	@PORT@
+%define lcport 	@LCPORT@
 %define tarname @TARNAME@
+%define version @VERSION@
+%define release 1
 
 %if %{debug}
-    %define name wxPython%{port}_py%{pyver}_dbg
+    %define name      wxPython%{port}-py%{pyver}-dbg
+    %define othername wxPython%{port}-py%{pyver}
 %else
-    %define name wxPython%{port}_py%{pyver}
+    %define name      wxPython%{port}-py%{pyver}
+    %define othername wxPython%{port}-py%{pyver}-dbg
 %endif
-%define version 2.3.3pre5
-%define release 1
 
 
 Summary: Cross platform GUI toolkit for Python using wx%{port}
@@ -28,21 +30,17 @@ BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix: %{pref}
 
 
-# They conflict with each other
-%if %{debug}
-Conflicts: wxPython%{port}_py%{pyver}
-%else
-Conflicts: wxPython%{port}_py%{pyver}_dbg
-%endif
-
 Provides: wxwin
 Provides: wx%{port} = %{version}
 Provides: wxPython  = %{version}
 
 
-# ?? Obsoletes: wx%{port}, wxPython
-# Some funky mandrake names
-Conflicts: wxGTK2.3, wxGTK6
+# They conflict with each other, so let them replace each other
+Obsoletes: %{othername}
+# old wx and wxPython packages
+Obsoletes: wx%{port}, wxPython
+# and some funky mandrake names
+Obsoletes: wxGTK2.3, wxGTK6
 
 
 %description
@@ -56,7 +54,7 @@ includes the wx%{port} shared libs and etc.
 
 
 %prep
-%setup -n %{tarname}-%{version}
+%setup -q -n %{tarname}-%{version}
 
 
 %build
@@ -83,6 +81,8 @@ cd build
 	--with-libtiff=builtin \
 	--with-zlib=builtin \
 
+##	--enable-debug_flag \
+
 # Build wxWindows
 $MAKE
 
@@ -120,7 +120,7 @@ cd wxPython
 
 
 %clean
-##[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 %post