diff --git a/slides/Makefile b/slides/Makefile
index c6e3489..6b56be0 100644
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -2,7 +2,7 @@ SRC := slides.md
 SCRIPTDIR=scripts
 FILENAME := tutorial-slides
 DEPS := preamble-caption.tex
-PDFLAGS := -s -S -t beamer --latex-engine=xelatex --slide-level=2
+PDFLAGS := -s -t beamer+smart --pdf-engine=xelatex --slide-level=2
 PDFLAGS += --filter=$(SCRIPTDIR)/pandoc-svg
 PDFLAGS += --filter=$(SCRIPTDIR)/overlay
 DEPS += $(patsubst %.svg,%.pdf,$(wildcard pictures/6lowpan-route-over*.svg)\
@@ -28,7 +28,7 @@ $(FILENAME).pdf: $(SRC) $(DEPS)
 	       $(foreach B,$(filter before-%.tex,$^),-B $(B)) -o $@ $(PDFLAGS) $<
 
 pictures/%.pdf: pictures/%.svg
-	inkscape --export-pdf=$@ $<
+	inkscape --export-latex=$@ $<
 
 clean:
 	rm -f $(FILENAME)* $(filter pictures/%.pdf,$(DEPS)) \
diff --git a/slides/scripts/pandoc-svg b/slides/scripts/pandoc-svg
index c5cd119..0fe8e73 100755
--- a/slides/scripts/pandoc-svg
+++ b/slides/scripts/pandoc-svg
@@ -14,8 +14,8 @@ from pandocfilters import toJSONFilter, Image
 
 # TODO add emf export if fmt=="docx" ?
 fmt_to_option = {
-    "latex": ("--export-pdf", "pdf"),
-    "beamer": ("--export-pdf", "pdf"),
+    "latex": ("--export-latex", "pdf"),
+    "beamer": ("--export-latex", "pdf"),
     # because of IE
     "html": ("--export-png", "png")
 }
diff --git a/slides/slides.md b/slides/slides.md
index d28809b..095ce1a 100644
--- a/slides/slides.md
+++ b/slides/slides.md
@@ -236,9 +236,8 @@ USEMODULE += xtimer
 # General networking architecture
 ## RIOT's Networking architecture
 * Designed to integrate any network stack into RIOT
-
-\only{<1>}{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}}
-\only{<2>}{\includegraphics[width=\textwidth]{pictures/overview-net-netdev.pdf}}
+\only<1>{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}}
+\only<2>{\includegraphics[width=\textwidth]{pictures/overview-net-netdev.pdf}}
 
 ## Including the network device driver
 * Go to task-05 directory (`cd ../task-05`)
@@ -253,7 +252,7 @@ USEMODULE += auto_init_gnrc_netif
 * Use `tapsetup` script in RIOT repository:
 
 ```sh
-./../RIOT/dist/tools/tapsetup/tapsetup -c 2
+../RIOT/dist/tools/tapsetup/tapsetup -c 2
 ```
 
 * Creates
@@ -264,18 +263,18 @@ USEMODULE += auto_init_gnrc_netif
 ## Task 5.1 -- Your first networking application
 * Run the application on `native`: `PORT=tap0 make all term`
 * Type `help`
-* Run a second instance with `PORT=tap1 make all term`
+* Run a second instance with `PORT=tap1 make term`
 * Type `ifconfig` on both to get hardware address and interface number
 * Use `txtsnd` command to exchange messages between the two instances
 
 ## Task 5.2 -- Use your application on real hardware
-* Compile, flash, and run on the board `BOARD=samr21-xpro make all flash term`
+* Compile, flash, and run on the board `BOARD=samr21-xpro make flash term`
 * Type `ifconfig` to get your hardware addresses
 * Use `txtsnd` to send one of your neighbors a friendly message
 
 ## RIOT's Networking architecture
-\only{<1>}{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}}
-\only{<2>}{\includegraphics[width=\textwidth]{pictures/overview-net-sock.pdf}}
+\only<1>{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}}
+\only<2>{\includegraphics[width=\textwidth]{pictures/overview-net-sock.pdf}}
 
 ## sock
 * collection of unified connectivity APIs to the transport layer