diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2eb123b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+*.o
+*.a
+*.so
+*.swp
+*.so*
+*.pc
+*.bak
+*.org
+*.orig
+*.diff
+*.log
+*.rej
diff --git a/Makefile b/Makefile
index bed2526..b73f0f2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DEFS= -DNOERROR
 CFLAGS= -I.. -I../.. -I../../.. -I./include -I./common -I./render -I./Xext -I./lbx -I./fb -I./mi -I./miext/shadow -I./hw/kdrive -I./miext/layer -I./os $(COMMONDEFS) $(DEFS)
 
 OBJS=
-all: core Xfbdev
+all: core Xfbdev xinit
 
 core:
 	cd render; make
@@ -30,11 +30,11 @@ Xvesa: core
 	
 Xfbdev: core
 	cd hw/kdrive/fbdev; make
-	$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm	
+	$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm
 	
 xinit:
 	cd init; make
-	$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o -lX11
+	$(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o $(LINKDIR) -lX11 -lpthread
 
 clean:
 	cd render; make clean
@@ -61,7 +61,7 @@ clean:
 install:
 	install -D -m 755 Xfbdev $(DESTDIR)/$(BINDIR)/Xfbdev
 	install -m 755 xinit $(DESTDIR)/$(BINDIR)/xinit
-	ln -s $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X
+	ln -fs $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X
 	install -D -m 644 init/xinit.1 $(DESTDIR)/$(MANDIR)/man1/xinit.1
 	install -D -m 644 README $(DESTDIR)/$(DOCDIR)/tinyxserver/README
 	install -m 644 changelog $(DESTDIR)/$(DOCDIR)/tinyxserver/changelog
diff --git a/standard_definitions.mk b/standard_definitions.mk
index b50dfc5..07f8036 100644
--- a/standard_definitions.mk
+++ b/standard_definitions.mk
@@ -4,10 +4,10 @@ CC=/usr/bin/gcc
 #CC=/opt/musl/bin/musl-gcc
 
 ####compilerflags####
-COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES  \
--fno-strength-reduce -nodefaultlibs -fno-strict-aliasing \
--ffunction-sections -fdata-sections \
--I. -I/usr/xsrc/pkg/usr/include
+COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE \
+-D__KERNEL_STRICT_NAMES  -fno-strength-reduce -nodefaultlibs \
+-fno-strict-aliasing -ffunction-sections -fdata-sections -I. \
+-I/usr/xsrc/pkg/usr/include
 
 
 ####extensions####
@@ -109,6 +109,8 @@ LINKDIR=-L/usr/xsrc/pkg/usr/lib
 #INCDIR=/opt/musl/include
 
 PREDIR=/usr
-LIBDIR=$(DESTDIR)$(PREDIR)/lib
-INCDIR=$(DESTIR)$(PREDIR)/include
-
+LIBDIR=$(PREDIR)/lib
+INCDIR=$(PREDIR)/include
+BINDIR=$(PREDIR)/bin
+DOCDIR=$(PREDIR)/doc
+MANDIR=$(PREDIR)/man