diff --git a/hawk/Makefile.am b/hawk/Makefile.am
index b712a563..6c4498ba 100644
--- a/hawk/Makefile.am
+++ b/hawk/Makefile.am
@@ -17,13 +17,11 @@ distclean-local:
 
 ######################################################################
 
-TARGET ?= @build_cpu@
-
 rpm: dist-gzip
 	mkdir -p "@abs_builddir@/pkgs/RPM/BUILD"
 	mkdir -p "@abs_builddir@/pkgs/RPM/SOURCES"
 	mkdir -p "@abs_builddir@/pkgs/RPM/SRPMS"
 	mkdir -p "@abs_builddir@/pkgs/RPM/RPMS"
 	cp @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz "@abs_builddir@/pkgs/RPM/SOURCES"
-	rpmbuild --define "_topdir @abs_builddir@/pkgs/RPM" -ba @abs_builddir@/pkgs/hawk.spec --target=$(TARGET)
+	rpmbuild --define "_topdir @abs_builddir@/pkgs/RPM" -ba @abs_builddir@/pkgs/hawk.spec --target=@build_cpu@
 
diff --git a/hawk/Makefile.in b/hawk/Makefile.in
index e892cb5d..420d695e 100644
--- a/hawk/Makefile.in
+++ b/hawk/Makefile.in
@@ -170,8 +170,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \
 	$(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \
 	$(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing \
 	$(top_srcdir)/pkgs/hawk.spec.in ac/ar-lib ac/compile \
-	ac/config.guess ac/config.sub ac/install-sh ac/ltmain.sh \
-	ac/missing
+	ac/config.guess ac/config.sub ac/depcomp ac/install-sh \
+	ac/ltmain.sh ac/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -845,15 +845,13 @@ distclean-local:
 
 ######################################################################
 
-TARGET ?= @build_cpu@
-
 rpm: dist-gzip
 	mkdir -p "@abs_builddir@/pkgs/RPM/BUILD"
 	mkdir -p "@abs_builddir@/pkgs/RPM/SOURCES"
 	mkdir -p "@abs_builddir@/pkgs/RPM/SRPMS"
 	mkdir -p "@abs_builddir@/pkgs/RPM/RPMS"
 	cp @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz "@abs_builddir@/pkgs/RPM/SOURCES"
-	rpmbuild --define "_topdir @abs_builddir@/pkgs/RPM" -ba @abs_builddir@/pkgs/hawk.spec --target=$(TARGET)
+	rpmbuild --define "_topdir @abs_builddir@/pkgs/RPM" -ba @abs_builddir@/pkgs/hawk.spec --target=@build_cpu@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/hawk/lib/Makefile.am b/hawk/lib/Makefile.am
index 67c58cd2..eaa9e568 100644
--- a/hawk/lib/Makefile.am
+++ b/hawk/lib/Makefile.am
@@ -191,7 +191,7 @@ libhawk_la_SOURCES += \
 	mod-math.c mod-math.h \
 	mod-str.c mod-str.h \
 	mod-sys.c mod-sys.h
-libhawk_la_LIBADD +=
+libhawk_la_LIBADD += $(SOCKET_LIBS)
 
 if ENABLE_MOD_MYSQL
 libhawk_la_LIBADD += -lhawk-mysql
@@ -227,7 +227,7 @@ pkglib_LTLIBRARIES += libhawk-math.la
 libhawk_math_la_SOURCES = mod-math.c mod-math.h
 libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON)
 libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON)
-libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON)
+libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) $(LIBM)
 libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON)
 
 pkglib_LTLIBRARIES += libhawk-str.la
@@ -241,7 +241,7 @@ pkglib_LTLIBRARIES += libhawk-sys.la
 libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h
 libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON)
 libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON)
-libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON)
+libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) $(SOCKET_LIBS)
 libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON)
 
 endif
diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in
index 973c5c74..fcc149f9 100644
--- a/hawk/lib/Makefile.in
+++ b/hawk/lib/Makefile.in
@@ -105,7 +105,7 @@ host_triplet = @host@
 @ENABLE_STATIC_MODULE_TRUE@	mod-str.c mod-str.h \
 @ENABLE_STATIC_MODULE_TRUE@	mod-sys.c mod-sys.h
 
-@ENABLE_STATIC_MODULE_TRUE@am__append_10 = 
+@ENABLE_STATIC_MODULE_TRUE@am__append_10 = $(SOCKET_LIBS)
 @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = -lhawk-mysql
 @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = ../mod/libhawk-mysql.la
 @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = -lhawk-uci
@@ -213,6 +213,7 @@ libhawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 @ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 @ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@ENABLE_STATIC_MODULE_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 am__libhawk_la_SOURCES_DIST = hawk.h hawk-arr.h hawk-chr.h hawk-cmn.h \
 	hawk-dir.h hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h \
 	hawk-map.h hawk-rbt.h hawk-pack1.h hawk-utl.h hawk-std.h \
@@ -631,7 +632,7 @@ libhawk_la_DEPENDENCIES = $(am__append_12) $(am__append_14)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_SOURCES = mod-math.c mod-math.h
 @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON)
-@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON)
+@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) $(LIBM)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_SOURCES = mod-str.c mod-str.h
 @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON)
@@ -641,7 +642,7 @@ libhawk_la_DEPENDENCIES = $(am__append_12) $(am__append_14)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h
 @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON)
-@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON)
+@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) $(SOCKET_LIBS)
 @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON)
 all: hawk-cfg.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am