diff --git a/clientside/os/zapdisk/GNUmakefile.in b/clientside/os/zapdisk/GNUmakefile.in
index 2a2ee8f0d2def90f4af79a936049110638c4f840..4c174ee17fc3a7974fae34a3077bbdbe141f614b 100644
--- a/clientside/os/zapdisk/GNUmakefile.in
+++ b/clientside/os/zapdisk/GNUmakefile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2016 University of Utah and the Flux Group.
+# Copyright (c) 2000-2017 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -27,7 +27,8 @@ SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 CBINDIR		= $(DESTDIR)$(CLIENT_BINDIR)
 LBINDIR		= $(DESTDIR)/usr/local/bin
-IZSRCDIR	= $(TESTBED_SRCDIR)/os/imagezip
+IZSRCDIR	= $(SRCDIR)/../imagezip
+IZOBJDIR	= ../imagezip
 
 #
 # XXX should be in sync with imagezip/GNUmakefile
@@ -41,11 +42,11 @@ include $(OBJDIR)/Makeconf
 PARTFLAGS	= -I$(IZSRCDIR)
 PARTLIBS	=
 ifeq ($(WITH_MBR),1)
-PARTLIBS	+= $(OBJDIR)/os/imagezip/mbr/libmbr.a
+PARTLIBS	+= $(IZOBJDIR)/mbr/libmbr.a
 PARTFLAGS	+= -DWITH_MBR
 endif
 ifeq ($(WITH_GPT),1)
-PARTLIBS	+= $(OBJDIR)/os/imagezip/gpt/libgpt.a
+PARTLIBS	+= $(IZOBJDIR)/gpt/libgpt.a
 PARTFLAGS	+= -DWITH_GPT
 endif
 ifeq ($(WITH_ERASE),1)
@@ -74,7 +75,7 @@ erase.o:	$(IZSRCDIR)/erase.c
 	$(CC) -c $(CFLAGS) -o erase.o $<
 
 $(PARTLIBS):
-	@$(MAKE) -C $(OBJDIR)/os/imagezip partlibs
+	@$(MAKE) -C $(IZOBJDIR) partlibs
 
 install: