diff --git a/tikz/sin-cos/Makefile b/tikz/sin-cos/Makefile
new file mode 100644
index 0000000..b246e2a
--- /dev/null
+++ b/tikz/sin-cos/Makefile
@@ -0,0 +1,31 @@
+SOURCE = sin-cos
+DELAY = 80
+DENSITY = 300
+WIDTH = 500
+
+make:
+	pdflatex -shell-escape $(SOURCE).tex -output-format=pdf
+	make clean
+
+clean:
+	rm -rf  $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot *.table
+
+gif:
+	pdfcrop $(SOURCE).pdf
+	convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif
+	make clean
+
+png:
+	make
+	make svg
+	inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png
+
+transparentGif:
+	convert $(SOURCE).pdf -transparent white result.gif
+	make clean
+
+svg:
+	#inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg
+	pdf2svg $(SOURCE).pdf $(SOURCE).svg
+	# Necessary, as pdf2svg does not always create valid svgs:
+	inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg
diff --git a/tikz/sin-cos/Readme.md b/tikz/sin-cos/Readme.md
new file mode 100644
index 0000000..d3022c2
--- /dev/null
+++ b/tikz/sin-cos/Readme.md
@@ -0,0 +1,7 @@
+This should replace http://commons.wikimedia.org/wiki/File:Sinusburst.png
+
+Compiled example
+----------------
+![Example](sin-cos.png)
+
+
diff --git a/tikz/sin-cos/sin-cos.png b/tikz/sin-cos/sin-cos.png
new file mode 100644
index 0000000..8795347
Binary files /dev/null and b/tikz/sin-cos/sin-cos.png differ
diff --git a/tikz/sin-cos/sin-cos.tex b/tikz/sin-cos/sin-cos.tex
new file mode 100644
index 0000000..85b7913
--- /dev/null
+++ b/tikz/sin-cos/sin-cos.tex
@@ -0,0 +1,35 @@
+\documentclass{article}
+\usepackage[pdftex,active,tightpage]{preview}
+\setlength\PreviewBorder{0mm}
+
+\usepackage{pgfplots}
+\pgfplotsset{compat=1.9}
+
+\begin{document}
+\begin{preview}
+\begin{tikzpicture}[scale=0.5]
+    \begin{axis}[
+        axis x line=middle,
+        axis y line=middle,
+        enlarge y limits=true,
+        enlarge x limits=true,
+        xmin=0, xmax=2*pi, % x domain
+        width=15cm, height=8cm,     % size of the image
+        grid = major,
+        grid style={dashed, gray!30},
+        ymin=-1,      % start the diagram at this y-coordinate
+        ymax= 1,      % end   the diagram at this y-coordinate
+        axis background/.style={fill=white},
+        ylabel=$y$,
+        xlabel=$x$,
+        xtick={0,1.5708,3.14159,4.7123889,6.2830},
+        xticklabels={$0$,$\frac{\pi}{2}$,$\pi$,$\frac{3\pi}{2}$,$2\pi$},
+        legend style={at={(0.2,0.37)}, anchor=north}
+     ]
+      \addplot[domain=-8:8,thick,samples=200,red]   {sin(deg(x))};
+      \addplot[domain=-8:8,thick,samples=200,blue,dotted]   {cos(deg(x))};
+      \legend{$\sin x$, $\cos x$}
+    \end{axis} 
+\end{tikzpicture}
+\end{preview}
+\end{document}