diff --git a/GNUmakefile b/GNUmakefile
index 9a4c2d4..55d582b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,10 +1,12 @@
-PROG	= fctelnet
-OBJS	= o/fctelnet.a o/vt100.a o/telnet.a o/ansi.a o/chars.a o/marinetti.a o/display.a
+PROG	= marlene
+OBJS	= o/main.a o/vt100.a o/telnet.a o/ansi.a o/chars.a o/marinetti.a o/display.a
+
+CC = occ --gno
 
 OPTIMIZE ?= 79
 
 CFLAGS = -w-1 -O $(OPTIMIZE)
-CC = occ --gno
+ASMFLAGS =
 
 $(PROG): $(OBJS)
 	$(RM) o/ansi.root
@@ -12,21 +14,24 @@ $(PROG): $(OBJS)
 	$(CC) $(OBJS) -o $@
 
 
-fctelnet.o:	fctelnet.c marinetti.h
-vt100.o:	vt100.c CLAGS+=-r
-ansi.o:		ansi.asm
-chars.o:	chars.asm
-marinetti.o:	marinetti.c CLAGS+=-r
-telnet.o:	telnet.c CLAGS+=-r
+main.o: main.c
+vt100.o: vt100.c CLAGS+=-r
+ansi.o: ansi.asm
+chars.o: chars.asm
+marinetti.o: marinetti.c CLAGS+=-r
+telnet.o: telnet.c CLAGS+=-r
 
-o/%.a : %.c
+o :
+	mkdir o
+
+o/%.a : %.c | o
 	$(CC) -c $(CFLAGS) -o $@ $^
 
-o/%.a : %.asm
-	$(CC) -c $(CFLAGS) -o $@ $^
+o/%.a : %.asm | o
+	$(CC) -c $(ASMFLAGS) -o $@ $^
 
 
 clean:
-	$(RM) -f *.o *.root *.a *.r
+	$(RM) -rf o
 clobber: clean
 	$(RM) -f $(PROG)
diff --git a/fctelnet.c b/main.c
similarity index 100%
rename from fctelnet.c
rename to main.c
diff --git a/makefile b/makefile
index 00fcc67..569c0a2 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
-PROG	= fctelnet
-OBJS	= fctelnet.o vt100.o telnet.o ansi.o chars.o marinetti.o display.o
+PROG	= marlene
+OBJS	= main.o vt100.o telnet.o ansi.o chars.o marinetti.o display.o
 
 OPTIMIZE *= 79
 
@@ -11,12 +11,13 @@ $(PROG): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $@
 
 
-fctelnet.o:	fctelnet.c marinetti.h
+main.o:		main.c
 vt100.o:	vt100.c
 ansi.o:		ansi.asm
 chars.o:	chars.asm
 marinetti.o:	marinetti.c
 telnet.o:	telnet.c
+display.o:	display.c
 
 clean:
 	$(RM) -f *.o *.root *.a *.r