--- docbook-utils-0.6.10/bin/jw.in.a4	Tue Jun 11 14:25:12 2002
+++ docbook-utils-0.6.10/bin/jw.in	Tue Jun 11 14:26:38 2002
@@ -341,6 +351,27 @@
   echo "`basename $0`: Please specify at least one stylesheet" >&2
   exit 5
 fi
+
+case "$SGML_OPTIONS" in
+  *paper-size*)
+	;;
+  *)
+	# Set the paper size to A4 if the locale suggests so
+	papersize=
+	if [ -x /usr/bin/locale ]
+	then
+	  h=$(/usr/bin/locale LC_PAPER 2>/dev/null | head -1)
+	  if [ "$h" = 297 ]
+	  then
+	    papersize=A4
+	  fi
+	fi
+	if [ -n "$papersize" ]
+	then
+	  SGML_OPTIONS="-V paper-size=$papersize $SGML_OPTIONS"
+	fi
+	;;
+esac
 
 # Choose a parser
 if [ -z "$SGML_JADE" ]
--- docbook-utils-0.6.10/frontends/docbook.in.a4	Mon Apr 15 20:58:21 2002
+++ docbook-utils-0.6.10/frontends/docbook.in	Tue Jun 11 14:26:15 2002
@@ -18,21 +18,7 @@
   style-sheet)
 	case $SGML_STYLESHEET in
 	  default)
-	    base="${SGML_BASE_DIR}/docbook/utils-@VERSION@/docbook-utils"
-	    pagesize=
-	    if [ -x /usr/bin/locale ]
-	    then
-	      h=$(locale LC_PAPER 2>/dev/null | head -1)
-	      if [ "$h" = "297" ]
-	      then
-	        pagesize=-a4
-	      fi
-	    fi
-	    if [ -f "${base}${pagesize}.dsl" ]
-	    then
-	      base="${base}${pagesize}"
-	    fi
-	    echo "${base}.dsl#${SGML_TYPE}"
+	    echo "${SGML_BASE_DIR}/docbook/utils-@VERSION@/docbook-utils.dsl#${SGML_TYPE}"
 	    ;;
 	  none)
 	    find $SGML_BASE_DIR -name docbook.dsl | grep "$SGML_TYPE/docbook.dsl" | awk '{print $1}'