diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..949fee2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,33 @@
+# build id3.js
+
+# output dir
+DIST = dist
+PRODUCTS = id3-minimized.js id3.dev.js
+# prefixes every word in PRODUCTS with DIST; $(WORDS:WORD=PREFIX/WORD)
+OUTPUTS = $(PRODUCTS:%=$(DIST)/%)
+LIBS = $(DIST)/id3.lib.js $(DIST)/id3.core.js
+CLOSURE_COMPILER ?= ./compiler.jar
+
+.PHONY: all clean
+all: $(OUTPUTS)
+# The lib and core files are intermediates, not needed after compilation
+.INTERMEDIATE: $(LIBS)
+
+# Search for JS files in src/
+vpath %.js src
+
+# Actual dependencies for each lib
+$(DIST)/id3.lib.js: stringutils.js bufferedbinaryajax.js filereader.js base64.js
+$(DIST)/id3.core.js: id3.js id3v1.js id3v2.js id3v2frames.js id4.js
+$(DIST)/id3.dev.js: $(LIBS)
+
+$(DIST)/%.js:
+	cat $^ > $@
+
+$(DIST)/id3-minimized.js: $(DIST)/id3.dev.js
+	java -jar $(CLOSURE_COMPILER) --compilation_level ADVANCED_OPTIMIZATIONS \
+		--js $< > $@
+    #--formatting PRETTY_PRINT
+
+clean:
+	rm -f $(DIST)/*
diff --git a/make-minimize.sh b/make-minimize.sh
deleted file mode 100755
index 0c24b7c..0000000
--- a/make-minimize.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-CLOSURE_COMPILER=/usr/local/closure-compiler/compiler.jar
-
-java -jar "$CLOSURE_COMPILER" \
-    --compilation_level ADVANCED_OPTIMIZATIONS \
-    --js src/stringutils.js \
-    --js src/bufferedbinaryajax.js \
-    --js src/filereader.js \
-    --js src/base64.js \
-    --js src/id3.js \
-    --js src/id3v1.js \
-    --js src/id3v2.js \
-    --js src/id3v2frames.js \
-    --js src/id4.js \
-> dist/id3-minimized.js
-
-#--formatting PRETTY_PRINT \
\ No newline at end of file