diff --git a/Makefile b/Makefile
index c0d6924..bf82d38 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,15 @@ PROG= apple1
 SRCS= src/main.c src/pia.c v6502/v6502/log.c v6502/v6502/debugger.c v6502/v6502/breakpoint.c
 OBJS= $(SRCS:.c=.o)
 
+V6502_PREFIX= v6502
 include v6502/libvars.mk
-V6502_PREFIX=   v6502
-LIBV6502_DIR=   $(V6502_PREFIX)/v6502
-LIBAS6502_DIR=  $(V6502_PREFIX)/as6502
-LIBDIS6502_DIR= $(V6502_PREFIX)/dis6502
 
-AS=     $(LIBAS6502_DIR)/as6502
+AS=     $(V6502_PREFIX)/as6502/as6502
 ROM=    apple1.rom
 ROMSRC= src/wozmon.s
 
 CFLAGS+= -I$(V6502_PREFIX) -std=c99 -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE
-LDFLAGS= -ledit -lcurses -ldis6502 -las6502 -lv6502 -L$(LIBV6502_DIR) -L$(LIBAS6502_DIR) -L$(LIBDIS6502_DIR)
+LDFLAGS+= -ledit -lcurses -ldis6502 -las6502 -lv6502
 
 all: $(PROG) $(ROM)
 
@@ -24,21 +21,9 @@ $(PROG): $(LIBV6502) $(LIBAS6502) $(LIBDIS6502) $(OBJS)
 	$(CC) $(OBJS) -o $(PROG) $(LDFLAGS)
 
 $(AS):
-	$(MAKE) -C $(LIBAS6502_DIR)
+	$(MAKE) -C $(V6502_PREFIX)/as6502
 
-$(LIBV6502):
-	$(MAKE) -C $(LIBV6502_DIR) lib
-
-$(LIBAS6502):
-	$(MAKE) -C $(LIBAS6502_DIR) lib
-
-$(LIBDIS6502):
-	$(MAKE) -C $(LIBDIS6502_DIR) lib
-
-cleanlib:
-	$(MAKE) -C $(V6502_PREFIX) clean
-
-clean: cleanlib
+clean:
 	rm -f $(PROG) $(ROM) $(OBJS)
 
 .c.o:
diff --git a/v6502 b/v6502
index 1e8aa9e..6ec0220 160000
--- a/v6502
+++ b/v6502
@@ -1 +1 @@
-Subproject commit 1e8aa9ed9a61648e87967bbb63aad1239ccf9634
+Subproject commit 6ec02209b776e65ccb85eca6da65c54b554ac9d0