diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index d8fc5cd5e8..73955679af 100644
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -112,9 +112,9 @@ $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJ
 	@test -d .libs || mkdir .libs
 	@error="";\
 	if test -f $(CSOURCEFILE); then \
-	$(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
+	$(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
 	else \
-	$(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
+	$(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
 	fi;
 
 mod_clean:
diff --git a/configure.in b/configure.in
index 0dec5d86e2..fa9fe7a038 100644
--- a/configure.in
+++ b/configure.in
@@ -100,6 +100,9 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
         *darwin*)
             SOLINK="-dynamic -bundle -force-flat-namespace"
         ;;
+        *-solaris2*)
+            SOLINK="-shared -Xlinker"
+        ;;
         *)
             SOLINK="-shared -Xlinker -x"
         ;;