diff --git a/Makefile b/Makefile
index 9f8f349..dd369a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 CONFIG ?= release
 BUILD_DIR := ./build/${CONFIG}
-JUCE_ROOT := ../JUCE-3.1.1
-
+JUCE_ROOT := juce/JUCE-3.1.1
+JUCE_LIB := juce/build/${CONFIG}/libjuce.a
+	
 GPP_SRCS := gui.cpp Rbm.cpp Layer.cpp Stack.cpp MainComponent.cpp RbmComponent.cpp DrawComponent.cpp
 GPP_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS)))
 GCC_SRCS := noise.c
@@ -25,7 +26,7 @@ INCLUDES := -I${JUCE_ROOT} -Ijuce
 LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext
 DEFINES := -DARMA_OPENMP_THREADS=1
 	
-all: ${BUILD_DIR}/rbm.elf
+all: ${JUCE_LIB} ${BUILD_DIR}/rbm.elf
 test: ${BUILD_DIR}/test.elf
 	
 ${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp
@@ -43,7 +44,7 @@ ${BUILD_DIR}/test.elf: ${TEST_SRCS}
 	mkdir -p $(dir $@)
 	g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp
 
-juce/build/${CONFIG}/libjuce.a: 
+${JUCE_LIB}: 
 	make -C juce
 clean:
-	rm -rf ${BUILD_DIR}/*
\ No newline at end of file
+	rm -rf ${BUILD_DIR}
\ No newline at end of file
diff --git a/juce/JUCE-3.1.1.zip b/juce/JUCE-3.1.1.zip
new file mode 100644
index 0000000..32b7333
Binary files /dev/null and b/juce/JUCE-3.1.1.zip differ
diff --git a/juce/Makefile b/juce/Makefile
index 1c3e51f..c6f71e7 100644
--- a/juce/Makefile
+++ b/juce/Makefile
@@ -1,6 +1,6 @@
 CONFIG ?= release
 BUILD_DIR := ./build/${CONFIG}
-JUCE_ROOT=../../JUCE-3.1.1
+JUCE_ROOT=./JUCE-3.1.1
 SRCS := modules/juce_core/juce_core.cpp
 SRCS += modules/juce_data_structures/juce_data_structures.cpp
 SRCS += modules/juce_events/juce_events.cpp
@@ -10,7 +10,8 @@ SRCS += modules/juce_gui_extra/juce_gui_extra.cpp
 SRCS += modules/juce_opengl/juce_opengl.cpp
 OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(SRCS)))
 	
-all: ${BUILD_DIR}/libjuce.a
+all: ${JUCE_ROOT} ${BUILD_DIR}/libjuce.a
+prepare: ${JUCE_ROOT}
 
 CXXFLAGS += -std=c++11
 CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
@@ -25,5 +26,13 @@ ${OBJS}: $(BUILD_DIR)/%.o : ${JUCE_ROOT}/%.cpp
 ${BUILD_DIR}/libjuce.a: ${OBJS}
 	ar -q $@ ${OBJS}
 
+${JUCE_ROOT}:
+	unzip JUCE-3.1.1.zip
+
 clean:
-	rm -rf ${BUILD_DIR}/*
\ No newline at end of file
+	rm -rf ${BUILD_DIR}/*
+
+distclean:
+	rm -rf ${BUILD_DIR}
+	rm -rf ${JUCE_ROOT}
+