diff --git a/Makefile.am b/Makefile.am
index ae07240..5382171 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,8 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 dist_man_MANS = yubico-piv-tool.1
 MAINTAINERCLEANFILES += $(dist_man_MANS)
 
+EXTRA_DIST = windows.mk mac.mk
+
 yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \
 		$(top_srcdir)/configure.ac
 	$(HELP2MAN) --no-info \
diff --git a/mac.mk b/mac.mk
new file mode 100644
index 0000000..16d4c4f
--- /dev/null
+++ b/mac.mk
@@ -0,0 +1,55 @@
+# Copyright (C) 2014 Yubico AB
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Additional permission under GNU GPL version 3 section 7
+#
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, We grant you additional 
+# permission to convey the resulting work. Corresponding Source for a
+# non-source form of such a combination shall include the source code
+# for the parts of OpenSSL used as well as that of the covered work.
+
+PACKAGE=yubico-piv-tool
+
+all: usage mac
+
+.PHONY: usage
+usage:
+	@if test -z "$(VERSION)" || test -z "$(PGPKEYID)"; then \
+		echo "Try this instead:"; \
+		echo "  make PGPKEYID=[PGPKEYID] VERSION=[VERSION]"; \
+		echo "For example:"; \
+		echo "  make PGPKEYID=2117364A VERSION=1.6.0"; \
+		exit 1; \
+	fi
+
+doit:
+	rm -rf tmp && mkdir tmp && cd tmp && \
+	mkdir -p root/licenses && \
+	cp ../$(PACKAGE)-$(VERSION).tar.gz . && \
+	tar xfz $(PACKAGE)-$(VERSION).tar.gz && \
+	cd $(PACKAGE)-$(VERSION)/ && \
+	./configure --prefix=$(PWD)/tmp/root && \
+	make install $(CHECK) && \
+	cp COPYING $(PWD)/tmp/root/licenses/$(PACKAGE).txt && \
+	cd .. && \
+	cd root && \
+	zip -r ../../$(PACKAGE)-$(VERSION)-$(ARCH).zip *
+
+mac:
+	$(MAKE) -f mac.mk doit