patch

diff --git a/mswindows/osgeo4w/env.bat.tmpl b/mswindows/osgeo4w/env.bat.tmpl
index 04065161a..42a67f8c5 100644
--- a/mswindows/osgeo4w/env.bat.tmpl
+++ b/mswindows/osgeo4w/env.bat.tmpl
@@ -13,7 +13,8 @@ set GRASS_COMPATIBILITY_TEST=0
 set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python3.exe
 set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
 
-set FONTCONFIG_FILE=%GISBASE%\etc\fonts.conf
+set PYTHONPATH=%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\python;%PYTHONPATH%
+set GRASS_COMPATIBILITY_TEST=0
 
 REM
 REM RStudio-related
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 50d5b9ddc..9f7e32108 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -117,6 +117,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	rm -f mswindows/osgeo4w/package.log.*
 
 	mkdir -p mswindows/osgeo4w/lib
+	cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.lib
 	cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
 
 
@@ -155,7 +156,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 		--with-openmp \
 		--with-postgres \
 		--with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
-		--with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
+		--with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
 		--with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
 		--with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
 		--with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \