diff --git a/Makefile.defs b/Makefile.defs
index b3d4d1d..86bb884 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -846,6 +846,10 @@ rtld[GNU_UNIQUE] = ldconfig
 libgs.so.9[][64bit] = ghostscript
 endif
 
+# Generic fixes
+libpq.so.5 = libpostgresql
+libpq.so.5[][64bit] = libpostgresql
+
 ksplashtheme = ksplash-theme-openmamba
 ksplash-theme-openmamba = ksplash-theme-openmamba
 
diff --git a/makedist.inc.sh b/makedist.inc.sh
index 3e3d07a..532968a 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -107,7 +107,7 @@ if [ "$PREPLATFORM_TARGET" ]; then
 fi
 
 #install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools ""
-install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
+install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "--replacepkgs ${RPMEXTRAARGS}"
 
 if [ "$MULTILANGUAGE" ]; then
    for l in $MULTILANGUAGE; do