diff --git a/talks-public/Makefile.slides b/talks-public/Makefile.slides
deleted file mode 120000
index 0efe1a9..0000000
--- a/talks-public/Makefile.slides
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.slides.rubber
\ No newline at end of file
diff --git a/talks-public/Makefile.slides b/talks-public/Makefile.slides
new file mode 100644
index 0000000..c057acd
--- /dev/null
+++ b/talks-public/Makefile.slides
@@ -0,0 +1,31 @@
+# Depends: rubber
+
+ORGS = $(wildcard *.org)
+TEXHOS = $(patsubst %.org,%.handout.tex,$(ORGS))
+TEXS = $(patsubst %.org,%.tex,$(ORGS))
+PDFS = $(patsubst %.org,%.pdf,$(ORGS))
+PDFHOS = $(patsubst %.org,%.handout.pdf,$(ORGS))
+
+export TEXINPUTS = :$(CURDIR)/../../common/latex/
+
+all: $(PDFS)
+
+handouts: $(PDFHOS)
+
+.PRECIOUS: $(TEXS)
+%.tex: %.org
+	../bin/export-org-to-beamer $<
+
+%.pdf: %.tex
+	rubber -m pdftex $<
+
+%.handout.tex: %.tex
+	sed 's/\\documentclass[[]/\\documentclass[handout,/' $< > $@
+
+clean: $(patsubst %,%/clean,$(TEXS) $(TEXHOS))
+
+%/clean:
+	if [ -f $* ]; then rubber -m pdftex --clean $* ; fi
+	rm -f $*
+
+distclean: clean