diff --git a/.gitignore b/.gitignore
index 0983487..03fa769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.o
 *.a
 m16vm
-/as
+m16as
diff --git a/Makefile b/Makefile
index 4360200..b3b1679 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@ CC = gcc
 CFLAGS = -g -Ilib/include -DMEM_SIZE=32 -DM16_DEBUG_MEM
 LD = $(CC)
 
-PROGRAMS = m16vm as
+PROGRAMS = m16vm m16as
 
 all: $(PROGRAMS)
 
 m16vm : src/vm.o src/cpu.o src/mm.o src/instr_decode.o src/syscall.o src/program.o
 	$(LD) $(LDFLAGS) -o $@ $^
 
-as : src/as/as.o src/as/parser.o src/as/lexer.o \
+m16as : src/as/as.o src/as/parser.o src/as/lexer.o \
 	src/as/codegen.o src/as/error.o src/as/symtab.o \
 	src/as/ast.o lib/libm16.a
 	$(LD) $(LDFLAGS) -o $@ $^