diff --git a/ush/gfs_bfr2gpk.sh b/ush/gfs_bfr2gpk.sh
index 545d77cd68..1b77237cf6 100755
--- a/ush/gfs_bfr2gpk.sh
+++ b/ush/gfs_bfr2gpk.sh
@@ -27,9 +27,9 @@ export BPATH
 
 #  Set output directory:
 
-COMAWP=${COMAWP:-$COMROOT/nawips/${envir}/${RUN}.${PDY}}
+COMAWP=${COMAWP:-$COMOUT/gempak}
 OUTDIR=$COMAWP
-mkdir -p $OUTDIR
+if [ ! -d $OUTDIR ]; then mkdir -p $OUTDIR; fi
 
 outfilbase=gfs_${PDY}${cyc}