diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 66c53a20af2c2066ca17f02ad7dcb6eea7e35f9a..8612da0eda206133123342ce74dc674d3505aede 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-23  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+	* gcc_release (usage): Document that -s now takes symbolic name
+	and branch of the snapshot as parameters.
+	Implement this as part of command-line processing.
+	(BRANCH): Remove default initialization for snapshots.
+	(CVSBRANCH): Ditto.
+	Do not lay down a CVS tag if generating a snapshot from mainline.
+	
 2003-07-19  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* gcc_release (announce_snapshot): Use ${RELEASE} instead
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 3417abb08722388faf0e95de1415550bf3442e09..2966b6e431f2a2d510175e14fec36ce59fca8d6e 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -64,13 +64,13 @@ inform() {
 
 usage() {
 cat <<EOF
-gcc_release -r release [further options]
-gcc_release -s [further options]
+gcc_release -r release [-f] [further options]
+gcc_release -s name:cvsbranch [further options]
 
 Options:
 
   -r release           Version of the form X.Y or X.Y.Z.
-  -s                   Create a snapshot, not a real release.
+  -s name:cvsbranch    Create a snapshot, not a real release.
 
   -d destination       Local working directory where we will build the release
                        (default=${HOME}).
@@ -503,14 +503,17 @@ TAR="${TAR:-tar}"
 ########################################################################
 
 # Parse the options.
-while getopts "d:fr:u:t:p:sl" ARG; do
+while getopts "d:fr:u:t:p:s:l" ARG; do
     case $ARG in
     d)    DESTINATION="${OPTARG}";;
     r)    RELEASE="${OPTARG}";;
     t)    TAG="${OPTARG}";;
     u)    CVS_USERNAME="${OPTARG}";;
     f)    FINAL=1;;
-    s)    SNAPSHOT=1;;
+    s)    SNAPSHOT=1
+          BRANCH=${OPTARG%:*}
+          CVSBRANCH=${OPTARG#*:}
+          ;;
     l)    LOCAL=1
 	  SCP=cp
 	  FTP_PATH=~ftp/pub/gcc
@@ -585,13 +588,11 @@ if [ $SNAPSHOT -eq 0 ]; then
     FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
   fi
 else
-  # For now snapshots come from the 3.3 branch.
-  BRANCH="3.3"
-  CVSBRANCH=gcc-3_3-branch
-
   RELEASE=${BRANCH}-${DATE}
   FTP_PATH="${FTP_PATH}/snapshots/${RELEASE}"
-  TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
+  if [ ${CVSBRANCH} != "HEAD" ]; then
+    TAG=gcc-ss-`echo ${RELEASE} | tr '.' '_'`
+  fi
 
   # Building locally on gcc.gnu.org, we know what the last snapshot date
   # was.