diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile
index 80d2d48a3da32afdaeebd03ffac5f00d01111817..8be3454e078b331b1bc1b4cc6126f4a9bfe451bb 100644
--- a/src/sbbs3/GNUmakefile
+++ b/src/sbbs3/GNUmakefile
@@ -334,6 +334,25 @@ $(FILELIST): \
 	@echo Linking $@
 	@$(CC) -o $@ $^
 
+# MAKEUSER
+$(MAKEUSER): \
+	$(EXEODIR)/makeuser.o \
+	$(EXEODIR)/ars.o \
+	$(EXEODIR)/date_str.o \
+	$(EXEODIR)/load_cfg.o \
+	$(EXEODIR)/scfglib1.o \
+	$(EXEODIR)/scfglib2.o \
+	$(EXEODIR)/nopen.o \
+	$(EXEODIR)/str_util.o \
+	$(EXEODIR)/dat_rec.o \
+	$(EXEODIR)/userdat.o \
+	$(EXEODIR)/filewrap.o \
+	$(EXEODIR)/dirwrap.o \
+	$(EXEODIR)/genwrap.o
+	@echo Linking $@
+	@$(CC) -o $@ $^
+
+
 # Auto-dependency files
 -include $(LIBODIR)/*.d
 -include $(EXEODIR)/*.d
diff --git a/src/sbbs3/Makefile b/src/sbbs3/Makefile
index e5701252a7a4a910971d34357002c9d99e9eabcb..012e41eb2f5cd87822e8a4e95a1279dab384f483 100644
--- a/src/sbbs3/Makefile
+++ b/src/sbbs3/Makefile
@@ -208,3 +208,18 @@ $(FILELIST): filelist.c \
 	@echo Creating $@
 	@$(CC) $(CFLAGS) -n$(EXEODIR) $** 
 
+# MAKEUSER
+$(MAKEUSER): makeuser.c \
+	$(LIBODIR)\ars.obj \
+	$(LIBODIR)\nopen.obj \
+	$(LIBODIR)\str_util.obj \
+	$(LIBODIR)\date_str.obj \
+	dat_rec.c \
+	userdat.c \
+	genwrap.c \
+	dirwrap.c \
+	$(LIBODIR)\load_cfg.obj \
+	$(LIBODIR)\scfglib1.obj \
+	$(LIBODIR)\scfglib2.obj
+	@echo Creating $@
+	@$(CC) $(CFLAGS) -n$(EXEODIR) $** 
diff --git a/src/sbbs3/targets.mk b/src/sbbs3/targets.mk
index f9d62f9da37f061f150efc0d7b3038524d248f18..80a251d23828b25fc02af606501193701c7ba3af 100644
--- a/src/sbbs3/targets.mk
+++ b/src/sbbs3/targets.mk
@@ -22,12 +22,15 @@ SBBSECHO	= $(EXEODIR)$(SLASH)sbbsecho$(EXEFILE)
 ECHOCFG		= $(EXEODIR)$(SLASH)echocfg$(EXEFILE)
 ADDFILES	= $(EXEODIR)$(SLASH)addfiles$(EXEFILE)
 FILELIST	= $(EXEODIR)$(SLASH)filelist$(EXEFILE)
+MAKEUSER	= $(EXEODIR)$(SLASH)makeuser$(EXEFILE)
 
 all:	$(LIBODIR) $(EXEODIR) $(SBBSMONO) \
-		$(FIXSMB) $(CHKSMB) $(SMBUTIL) $(BAJA) $(NODE) $(SBBSECHO) $(ECHOCFG) $(ADDFILES) $(FILELIST)
+		$(FIXSMB) $(CHKSMB) $(SMBUTIL) $(BAJA) $(NODE) \
+		$(SBBSECHO) $(ECHOCFG) $(ADDFILES) $(FILELIST) $(MAKEUSER)
 
 utils:	$(EXEODIR) \
-		$(FIXSMB) $(CHKSMB) $(SMBUTIL) $(BAJA) $(NODE) $(SBBSECHO) $(ECHOCFG) $(ADDFILES) $(FILELIST)
+		$(FIXSMB) $(CHKSMB) $(SMBUTIL) $(BAJA) $(NODE) \
+		$(SBBSECHO) $(ECHOCFG) $(ADDFILES) $(FILELIST) $(MAKEUSER)
 
 dlls:	$(LIBODIR) \
 		$(SBBS) $(FTPSRVR) $(MAILSRVR) $(SERVICES)