Index: doc/bibliography/pl.bib
===================================================================
--- doc/bibliography/pl.bib	(revision 6cb935d44eac9fc5a0d5681d4222864aa38d730f)
+++ doc/bibliography/pl.bib	(revision a29c6e22a2d775ffa73748ce94a39f76d8667035)
@@ -830,5 +830,5 @@
     month	= oct,
     type	= {Diplomarbeit},
-    note	= {{\small\textsf{ftp://\-plg.uwaterloo.ca/\-pub/\-theses/\-KrischerThesis.ps.gz}}},
+    note	= {\href{https://plg.uwaterloo.ca/~usystem/theses/KrischerThesis.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-theses/\-KrischerThesis.pdf}},
 }
 
@@ -925,5 +925,5 @@
     key		= {Cforall},
     author	= {{\textsf{C}{$\mathbf{\forall}$} Features}},
-    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/features}{https://\-plg.uwaterloo.ca/\-~cforall/\-features}},
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/features}{https://\-plg.uwaterloo.ca/\-$\sim$cforall/\-features}},
     optnote	= {Accessed: 2018-01-01},
 }
@@ -1101,5 +1101,5 @@
     month	= oct,
     year	= 2001,
-    note	= {\href{http://plg.uwaterloo.ca/~cforall/cfa.ps}{http://\-plg.uwaterloo.ca/\-\char`\~cforall/\-cfa.ps}},
+    note	= {\href{http://plg.uwaterloo.ca/~cforall/cfa.ps}{http://\-plg.uwaterloo.ca/\-$\sim$cforall/\-cfa.ps}},
 }
 
@@ -1516,5 +1516,5 @@
     month	= dec,
     year	= 2017,
-    note	= {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uC++.pdf}{https://\-plg.uwaterloo.ca/\-~usystem/\-pub/\-uSystem/uC++.pdf}},
+    note	= {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uC++.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-pub/\-uSystem/uC++.pdf}},
 }
 
@@ -1809,5 +1809,5 @@
     author	= {Glen Ditchfield},
     title	= {Conversions for \textsf{C}$\mathbf{\forall}$},
-    note	= {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-\textasciitilde cforall/\-Conversions/\-index.html}},
+    note	= {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-$\sim$cforall/\-Conversions/\-index.html}},
     month	= {Nov},
     year	= {2002},
@@ -1877,5 +1877,5 @@
     title	= {CS343},
     year	= 2018,
-    howpublished= {\href{https://www.student.cs.uwaterloo.ca/~cs343}{https://\-www.student.cs.uwaterloo.ca/\-~cs343}},
+    howpublished= {\href{https://www.student.cs.uwaterloo.ca/~cs343}{https://\-www.student.cs.uwaterloo.ca/\-$\sim$cs343}},
 }
 
@@ -4144,5 +4144,5 @@
     month	= sep,
     year	= 2006,
-    note	= {\textsf{http://cs.anu.edu.au/\-\char`\~Robin.Garner/\-mmtk-guide.pdf}},
+    note	= {\textsf{http://cs.anu.edu.au/\-$\sim$Robin.Garner/\-mmtk-guide.pdf}},
 }
 
@@ -4248,5 +4248,5 @@
     month	= sep,
     year	= 1994,
-    note	= {{\small\textsf{ftp://\-plg.uwaterloo.ca/\-pub/\-uSystem/\-uSystem.ps.gz}}},
+    note	= {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uSystem.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-pub/\-uSystem/\-uSystem.pdf}},
 }
 
@@ -4790,5 +4790,5 @@
     year	= 1995,
     number	= 31,
-    note	= {{\small\textsf{http://\-www.cs.wustl.edu/\-\char`\~schmidt/\-PDF/\-IPC\_SAP-92.pdf}}},
+    note	= {{\small\textsf{http://\-www.cs.wustl.edu/\-$\sim$schmidt/\-PDF/\-IPC\_SAP-92.pdf}}},
 }
 
@@ -6132,5 +6132,5 @@
     month	= apr,
     type	= {Diplomarbeit},
-    note	= {\href{ftp://plg.uwaterloo.ca/pub/theses/SchusterThesis.ps.gz}{ftp://\-plg.uwaterloo.ca/\-pub/\-theses/\-SchusterThesis.ps.gz}},
+    note	= {\href{https://plg.uwaterloo.ca/~usystem/theses/SchusterThesis.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-theses/\-SchusterThesis.pdf}},
 }
 
Index: doc/papers/concurrency/Makefile
===================================================================
--- doc/papers/concurrency/Makefile	(revision 6cb935d44eac9fc5a0d5681d4222864aa38d730f)
+++ doc/papers/concurrency/Makefile	(revision a29c6e22a2d775ffa73748ce94a39f76d8667035)
@@ -4,7 +4,7 @@
 Figures = figures
 Macros = ../AMA/AMA-stix/ama
-TeXLIB = .:annex:../../LaTeXmacros:${Macros}:${Build}:../../bibliography:
+TeXLIB = .:../../LaTeXmacros:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
-BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=annex:../../bibliography: && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory # --silent
Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision 6cb935d44eac9fc5a0d5681d4222864aa38d730f)
+++ doc/papers/general/Makefile	(revision a29c6e22a2d775ffa73748ce94a39f76d8667035)
@@ -4,7 +4,7 @@
 Figures = figures
 Macros = ../AMA/AMA-stix/ama
-TeXLIB = .:${Macros}:${Build}:../../bibliography:
+TeXLIB = .:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
-BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=../../bibliography: && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory # --silent
Index: doc/user/Makefile
===================================================================
--- doc/user/Makefile	(revision 6cb935d44eac9fc5a0d5681d4222864aa38d730f)
+++ doc/user/Makefile	(revision a29c6e22a2d775ffa73748ce94a39f76d8667035)
@@ -4,7 +4,7 @@
 Figures = figures
 Macros = ../LaTeXmacros
-TeXLIB = .:${Macros}:${Build}:../bibliography:
+TeXLIB = .:${Macros}:${Build}:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
-BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+BibTeX = BIBINPUTS=../bibliography: && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory --silent #