diff --git a/src/backend/port/univel/port.c b/src/backend/port/univel/port.c
index cf293ccac6..907e344ee7 100644
--- a/src/backend/port/univel/port.c
+++ b/src/backend/port/univel/port.c
@@ -70,23 +70,6 @@ getrusage(int who, struct rusage * rusage)
 	return (0);
 }
 
-/*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific written prior permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	5.5 (Berkeley) 11/24/87";
-
-#endif							/* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index c929c781ac..2b99a28f88 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -17,8 +17,6 @@ $(POSTGRES_IMP):
 %$(EXPSUFF):
 	$(MKLDEXPORT) $*.o `pwd` > $*$(EXPSUFF)
 
-%.so: %.o %$(EXPSUFF)
+%$(DLSUFFIX): %.o %$(EXPSUFF)
 	@echo Making share library $@ from $*.o, $*$(EXPSUFF), and installed postgres.imp
-	$(LD) -H512 -e _nostart -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) -lc
-	#41+ $(LD) -H512 -bnoentry -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) -lc
-	#325 $(LD) -H512 -e _nostart -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) -lc
+	$(LD) -H512 -bM:SRE -bI:$(LIBDIR)/$(POSTGRES_IMP) -bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(CFLAGS_SL)
diff --git a/src/template/.similar b/src/template/.similar
index 3eab1ef47e..b630baa4d3 100644
--- a/src/template/.similar
+++ b/src/template/.similar
@@ -13,3 +13,6 @@ i586-pc-linux-gnu=linux-elf
 i686-pc-linux-gnu=linux-elf
 sparc-unknown-linux-gnu=linux-elf
 alpha-unknown-linux-gnu=linuxalpha
+powerpc-ibm-aix3.2.5=aix_325
+powerpc-ibm-aix4.1.4.0=aix_41
+powerpc-ibm-aix4.1.5.0=aix_41
diff --git a/src/template/aix_325 b/src/template/aix_325
new file mode 100644
index 0000000000..2cebc944c0
--- /dev/null
+++ b/src/template/aix_325
@@ -0,0 +1,11 @@
+AROPT:crs
+CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg
+SHARED_LIB:-e _nostart -lc
+ALL:
+SRCH_INC:
+SRCH_LIB:
+USE_LOCALE:no
+DLSUFFIX:.so
+YFLAGS:-d
+YACC:
+CC:xlc
diff --git a/src/template/aix-cc b/src/template/aix_41
similarity index 84%
rename from src/template/aix-cc
rename to src/template/aix_41
index 3be0d8abd6..bd900c9c42 100644
--- a/src/template/aix-cc
+++ b/src/template/aix_41
@@ -1,6 +1,6 @@
 AROPT:crs
 CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg
-SHARED_LIB:
+SHARED_LIB:-bnoentry -lc
 ALL:
 SRCH_INC:
 SRCH_LIB: