diff --git a/src/GNUmakefile.common b/src/GNUmakefile.common
index 700fd57..ab8a837 100644
--- a/src/GNUmakefile.common
+++ b/src/GNUmakefile.common
@@ -42,7 +42,7 @@ ${CDK}:
 
 ${UUID}:
 		rm ${DEPSDIR}/libuuid/ltmain.sh ${DEPSDIR}/libuuid/libtool || true
-		cd ${DEPSDIR}/libuuid/ && libtoolize
+		cd ${DEPSDIR}/libuuid/ && ${LIBTOOLIZE}
 		cd ${DEPSDIR}/libuuid/ && autoreconf
 		cd ${DEPSDIR}/libuuid/ && ./configure
 		cd ${DEPSDIR}/libuuid/ && ${MAKE} CC=${CC}
@@ -54,8 +54,7 @@ HDRS:=		bbs.h
 OBJS:=		inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o \
 		doors.o bbs_list.o chat_system.o email.o files.o settings.o \
 		lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o \
-		nodelist.o blog.o util.o stralloc/stralloc.o strlcpy/strlcpy.o \
-		strlcpy/strlcat.o
+		nodelist.o blog.o util.o stralloc/stralloc.o ${EXTRAOBJS}
 
 WWWOBJS:=	../deps/aha/aha.o ../deps/hashids/hashids.o www.o www_email.o \
 		www_msgs.o www_last10.o www_blog.o www_files.o ${OBJS}
diff --git a/src/GNUmakefile.freebsd b/src/GNUmakefile.freebsd
index 30ed892..98022de 100644
--- a/src/GNUmakefile.freebsd
+++ b/src/GNUmakefile.freebsd
@@ -2,6 +2,8 @@ CC:=			cc
 CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
+LIBTOOLIZE:=    libtoolize
+
 DEPS_LUA_TARGET:=	freebsd
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
diff --git a/src/GNUmakefile.linux b/src/GNUmakefile.linux
index 715271d..bb16c7e 100644
--- a/src/GNUmakefile.linux
+++ b/src/GNUmakefile.linux
@@ -1,6 +1,9 @@
 CC:=			cc
 CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -lmosquitto
+EXTRAOBJS:=     strlcpy/strlcpy.o strlcpy/strlcat.o
+
+LIBTOOLIZE:=    libtoolize
 
 DEPS_LUA_TARGET:=	linux
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
diff --git a/src/GNUmakefile.netbsd b/src/GNUmakefile.netbsd
index 2cf4442..7a8fd8e 100644
--- a/src/GNUmakefile.netbsd
+++ b/src/GNUmakefile.netbsd
@@ -2,6 +2,8 @@ CC:=			cc
 CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
+LIBTOOLIZE:=    libtoolize
+
 DEPS_LUA_TARGET:=	bsd
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
diff --git a/src/GNUmakefile.openbsd b/src/GNUmakefile.openbsd
index 0dfe079..e28f497 100644
--- a/src/GNUmakefile.openbsd
+++ b/src/GNUmakefile.openbsd
@@ -2,6 +2,8 @@ CC:=			egcc
 CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
+LIBTOOLIZE:=    libtoolize
+
 DEPS_LUA_TARGET:=	bsd
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
diff --git a/src/GNUmakefile.osx b/src/GNUmakefile.osx
index 676d9ed..935d44e 100644
--- a/src/GNUmakefile.osx
+++ b/src/GNUmakefile.osx
@@ -2,6 +2,8 @@ CC:=			cc
 CFLAGS:=		-std=gnu99 -I/opt/local/include
 LIBS:=			-L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv -lmosquitto
 
+LIBTOOLIZE:=    glibtoolize
+
 DEPS_LUA_TARGET:=	macosx
 DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
 
diff --git a/src/GNUmakefile.sunos b/src/GNUmakefile.sunos
index 13b376b..fdea58c 100644
--- a/src/GNUmakefile.sunos
+++ b/src/GNUmakefile.sunos
@@ -1,6 +1,9 @@
 CC:=			gcc
 CFLAGS:=		-std=gnu99 -I/usr/local/include
 LIBS:=			-L/usr/local/lib -lsqlite3 -lm -ldl -lssl -lcrypto -lssh -lmosquitto -lnsl -lsocket
+EXTRAOBJS:=     os/sunos.o
+
+LIBTOOLIZE:=    libtoolize
 
 DEPS_LUA_TARGET:=	solaris
 DEPS_JAMLIB_MAKEFILE:=	Makefile.sunos
diff --git a/utils/magimail/src/Makefile b/utils/magimail/src/Makefile
index 5436cd6..3c7668c 100644
--- a/utils/magimail/src/Makefile
+++ b/utils/magimail/src/Makefile
@@ -7,14 +7,14 @@ help:
 
 all:
 	mkdir -p obj
-	gmake -C cmnllib -f Makefile.linux
-	gmake -C oslib_linux
-	gmake -f Makefile.linux
+	${MAKE} -C cmnllib -f Makefile.linux
+	${MAKE} -C oslib_linux
+	${MAKE} -f Makefile.linux
 		
 clean:
-	gmake -C cmnllib -f Makefile.linux clean
-	gmake -C oslib_linux clean
-	gmake -f Makefile.linux clean
+	${MAKE} -C cmnllib -f Makefile.linux clean
+	${MAKE} -C oslib_linux clean
+	${MAKE} -f Makefile.linux clean
 
 
 freebsd:	all
diff --git a/utils/reset_pass/Makefile b/utils/reset_pass/Makefile
index 1f1916e..26a08bf 100644
--- a/utils/reset_pass/Makefile
+++ b/utils/reset_pass/Makefile
@@ -28,7 +28,7 @@ endif
 ifeq ($(OS), Darwin)
   CC=cc
   CFLAGS=-I/opt/local/include
-  LDFLAGS=
+  LDFLAGS=-L/opt/local/lib
 endif