--- src/services/name/Makefile.am
+++ src/services/name/Makefile.am.fixed 
@@ -6,11 +6,9 @@
 
 libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
 
-lib_LTLIBRARIES=libORBitCosNaming-2.la
+lib_LTLIBRARIES=libORBitCosNaming-2.la libname-server-2.la
 
 noinst_PROGRAMS = name-client-2 orbit-name-server-2
-
-lib_LIBRARIES = libname-server-2.a
 
 libORBitCosNaming_2_la_SOURCES = 					\
 	CosNaming-common.c 						\
@@ -25,6 +23,16 @@
 	-no-undefined							\
 	$(ORBIT_NAME_LIBS)						\
 	$(top_builddir)/src/orb/libORBit-2.la
+
+libname_server_2_la_SOURCES = \
+	orbit-name-server.c CosNaming-skels.c \
+	name-support.c name-support.h
+
+libname_server_2_la_DEPENDENCIES = $(DEPS) CosNaming.h
+
+libname_server_2_la_LDFLAGS = -no-undefined
+
+libname_server_2_la_LIBADD = libORBitCosNaming-2.la
 
 INCLUDES =				\
 	-I.				\
@@ -55,23 +63,19 @@
 	$(top_builddir)/src/orb/libORBit-2.la			\
 	libORBitCosNaming-2.la					\
 	$(libm)							\
 	$(ORBIT_NAME_LIBS)
 
-name_client_2_SOURCES = name-client.c name-support.c name-support.h
+name_client_2_SOURCES = name-client.c name-support.h
 name_client_2_LDFLAGS = $(FLAGS)
 name_client_2_DEPENDENCIES = $(DEPS) CosNaming.h
-name_client_2_LDADD = $(LDADDS)
-
-libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
-			   name-support.c name-support.h
-libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
+name_client_2_LDADD =  libname-server-2.la $(LDADDS)
 
 orbit_name_server_2_SOURCES = boot.c
 orbit_name_server_2_LDFLAGS = $(FLAGS)
 orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
-orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
+orbit_name_server_2_LDADD = libname-server-2.la $(LDADDS)
 
-$(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
+$(libname_server_2_la_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
 
 EXTRA_DIST = $(idl_DATA)