diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index 7c89e975bcf4e5fddec7b2ac51529fd532114fad..0044a8f3ca26e0182ba65a79a519a61712015214 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -8,11 +8,11 @@ AROPT = crs
 
 DLSUFFIX = .so
 ifneq ($(GCC), yes)
-  ifeq ($(host_os), aix3.2.5)
-    LDFLAGS_SL = -e _nostart
-  else
-    LDFLAGS_SL = -bnoentry
-  endif
+ifeq ($(host_os), aix3.2.5)
+	LDFLAGS_SL = -e _nostart
+else
+	LDFLAGS_SL = -bnoentry
+endif
 endif
 
 
@@ -28,11 +28,11 @@ $(POSTGRES_IMP):
 ifeq ($(host_os), aix3.2.5)
 	$(MKLDEXPORT) postgres $(bindir) > $@
 else
-  ifneq (,$(findstring aix4.1, $(host_os)))
+ifneq (,$(findstring aix4.1, $(host_os)))
 	$(MKLDEXPORT) postgres $(bindir) > $@
-  else
+else
 	$(MKLDEXPORT) postgres . > $@
-  endif
+endif
 endif
 	$(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) $(LIBS)
 
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 92888e18062f6ccf9313e9e643156a41e55ba81e..5722c46a17795845301c9599406935de36ec9ed2 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -1,7 +1,16 @@
 AROPT = crs
-export_dynamic = -Wl,-Bexport
+ifeq ($(with_gnu_ld), yes)
+	export_dynamic = -Wl,-E
+else
+	export_dynamic = -Wl,-Bexport
+endif
+
 ifeq ($(ld_R_works), yes)
-rpath = -Wl,-R$(libdir)
+ifeq ($(with_gnu_ld), yes)
+	rpath = -Wl,-rpath,$(libdir)
+else
+	rpath = -Wl,-R$(libdir)
+endif
 endif
 shlib_symbolic = -Wl,-Bsymbolic