diff --git a/sesman/Makefile.osx b/sesman/Makefile.osx
index 6b12dc82..5e0b7255 100644
--- a/sesman/Makefile.osx
+++ b/sesman/Makefile.osx
@@ -27,51 +27,51 @@ nopam: libscp_ no-pam tools
 kerberos: libscp_ kerberos-base tools
 
 no-pam: $(SESMANOBJ) verify_user.o
-       $(MAKE) -C libscp
-       $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
+	$(MAKE) -C libscp
+	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
 
 pam: $(SESMANOBJ) verify_user_pam.o
-       $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
+	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
 
 pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
-       $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
+	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
 
 kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
-       $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
+	$(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
 
 sessvc: $(SESSVCOBJ)
-       $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
+	$(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
 
 tools: sessvc
-       $(MAKE) -C tools -f Makefile.osx
+	$(MAKE) -C tools -f Makefile.osx
 
 libscp_:
-       $(MAKE) -C libscp -f Makefile.osx
+	$(MAKE) -C libscp -f Makefile.osx
 
 clean:
-       rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun sessvc.o sessvc
-       $(MAKE) -C tools -f Makefile.osx clean
-       $(MAKE) -C libscp -f Makefile.osx clean
+	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun sessvc.o sessvc
+	$(MAKE) -C tools -f Makefile.osx clean
+	$(MAKE) -C libscp -f Makefile.osx clean
 
 install:
-       install sesman $(DESTDIR)/sesman
-       install startwm.sh $(DESTDIR)/startwm.sh
-       install sesman.ini $(CFGDIR)/sesman.ini
-       install sessvc $(DESTDIR)/sessvc
-       $(MAKE) -C tools install
-       $(MAKE) -C libscp install
+	install sesman $(DESTDIR)/sesman
+	install startwm.sh $(DESTDIR)/startwm.sh
+	install sesman.ini $(CFGDIR)/sesman.ini
+	install sessvc $(DESTDIR)/sessvc
+	$(MAKE) -C tools install
+	$(MAKE) -C libscp install
 
 os_calls.o: ../common/os_calls.c
-       $(CC) $(C_OS_FLAGS) ../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
 
 d3des.o: ../common/d3des.c
-       $(CC) $(C_OS_FLAGS) ../common/d3des.c
+	$(CC) $(C_OS_FLAGS) ../common/d3des.c
 
 list.o: ../common/list.c
-       $(CC) $(C_OS_FLAGS) ../common/list.c
+	$(CC) $(C_OS_FLAGS) ../common/list.c
 
 file.o: ../common/file.c
-       $(CC) $(C_OS_FLAGS) ../common/file.c
+	$(CC) $(C_OS_FLAGS) ../common/file.c
 
 log.o: ../common/log.c
-       $(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
+	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
diff --git a/sesman/libscp/Makefile.osx b/sesman/libscp/Makefile.osx
index 93046306..d8750563 100644
--- a/sesman/libscp/Makefile.osx
+++ b/sesman/libscp/Makefile.osx
@@ -27,19 +27,19 @@ C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
 
 all: $(LIBSCPOBJ)
-       $(CC) $(LDFLAGS) -o $(LIBSCPFNAME) $(LIBSCPOBJ)
-       ln -f -s $(LIBSCPFNAME) $(LIBSCPLNAME)
+	$(CC) $(LDFLAGS) -o $(LIBSCPFNAME) $(LIBSCPOBJ)
+	ln -f -s $(LIBSCPFNAME) $(LIBSCPLNAME)
 
 clean:
-       rm -f $(LIBSCPOBJ) $(LIBSCPFNAME) $(LIBSCPLNAME)
+	rm -f $(LIBSCPOBJ) $(LIBSCPFNAME) $(LIBSCPLNAME)
 
 install:
-       install $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPFNAME)
-       ln -f -s $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPLNAME)
+	install $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPFNAME)
+	ln -f -s $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPLNAME)
 
 installdeb:
-       install $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPFNAME)
-       ln -f -s $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
+	install $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPFNAME)
+	ln -f -s $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
 
 os_calls.o: ../../common/os_calls.c
-       $(CC) $(C_OS_FLAGS) ../../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
diff --git a/sesman/tools/Makefile.osx b/sesman/tools/Makefile.osx
index 8f779335..3a9de080 100644
--- a/sesman/tools/Makefile.osx
+++ b/sesman/tools/Makefile.osx
@@ -24,22 +24,22 @@ CC = gcc
 all: stest srun
 
 stest: $(SESTESTOBJ)
-       $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
+	$(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
 
 srun: $(SESRUNOBJ)
-       $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
+	$(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
 
 os_calls.o: ../../common/os_calls.c
-       $(CC) $(C_OS_FLAGS) ../../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
 
 #d3des.o: ../../common/d3des.c
-       $(CC) $(C_OS_FLAGS) ../../common/d3des.c
+#	$(CC) $(C_OS_FLAGS) ../../common/d3des.c
 
 #list.o: ../../common/list.c
-       $(CC) $(C_OS_FLAGS) ../../common/list.c
+#	$(CC) $(C_OS_FLAGS) ../../common/list.c
 
 #file.o: ../../common/file.c
-       $(CC) $(C_OS_FLAGS) ../../common/file.c
+#       $(CC) $(C_OS_FLAGS) ../../common/file.c
 
 log.o: ../../common/log.c
        $(CC) $(C_OS_FLAGS) ../../common/log.c
@@ -48,18 +48,18 @@ log.o: ../../common/log.c
 #      $(CC) $(C_OS_FLAGS) ../tcp.c
 
 config.o: ../config.c
-       $(CC) $(C_OS_FLAGS) ../config.c
+	$(CC) $(C_OS_FLAGS) ../config.c
 
 #libscp_v1c.o: ../libscp_v1c.c
 #      $(CC) $(C_OS_FLAGS) ../libscp_v1c.c
 
 clean:
-       rm -f *.o sestest sesrun
+	rm -f *.o sestest sesrun
 
 install:
-       install sesrun $(DESTDIR)/sesrun
-       install sestest $(DESTDIR)/sestest
+	install sesrun $(DESTDIR)/sesrun
+	install sestest $(DESTDIR)/sestest
 
 installdeb:
-       install sesrun $(DESTDIRDEB)/usr/lib/xrdp/sesrun
-       install sestest $(DESTDIRDEB)/usr/lib/xrdp/sestest
+	install sesrun $(DESTDIRDEB)/usr/lib/xrdp/sesrun
+	install sestest $(DESTDIRDEB)/usr/lib/xrdp/sestest
diff --git a/vnc/Makefile.osx b/vnc/Makefile.osx
index 522f2d38..158daa0c 100644
--- a/vnc/Makefile.osx
+++ b/vnc/Makefile.osx
@@ -21,17 +21,17 @@ CC = gcc
 all: $(VNCLIB)
 
 $(VNCLIB): $(VNCOBJ)
-       $(CC) $(LDFLAGS) -o $(VNCLIB) $(VNCOBJ) $(LIBS)
+	$(CC) $(LDFLAGS) -o $(VNCLIB) $(VNCOBJ) $(LIBS)
 
 clean:
-       rm -f $(VNCOBJ) $(VNCLIB)
+	rm -f $(VNCOBJ) $(VNCLIB)
 
 os_calls.o: ../common/os_calls.c
-       $(CC) $(C_OS_FLAGS) ../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
 
 d3des.o: ../common/d3des.c
-       $(CC) $(C_OS_FLAGS) ../common/d3des.c
+	$(CC) $(C_OS_FLAGS) ../common/d3des.c
 
 install:
-       install $(VNCLIB) $(DESTDIR)/$(VNCLIB)
+	install $(VNCLIB) $(DESTDIR)/$(VNCLIB)
 
diff --git a/xup/Makefile.osx b/xup/Makefile.osx
index a00ef471..9f0f4f7c 100644
--- a/xup/Makefile.osx
+++ b/xup/Makefile.osx
@@ -22,14 +22,14 @@ CC = gcc
 all: $(LIBXUP)
 
 $(LIBXUP): $(XUPOBJ)
-       $(CC) $(LDFLAGS) -o $(LIBXUP) $(XUPOBJ) $(LIBS)
+	$(CC) $(LDFLAGS) -o $(LIBXUP) $(XUPOBJ) $(LIBS)
 
 clean:
-       rm -f $(XUPOBJ) $(LIBXUP)
+	rm -f $(XUPOBJ) $(LIBXUP)
 
 os_calls.o: ../common/os_calls.c
-       $(CC) $(C_OS_FLAGS) ../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
 
 install:
-       install $(LIBXUP) $(DESTDIR)/$(LIBXUP)
+	install $(LIBXUP) $(DESTDIR)/$(LIBXUP)